diff options
author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 12:36:27 +0000 |
---|---|---|
committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 12:36:27 +0000 |
commit | c8ff7c9eae9ded873df5dcb230f35e78aecd4e36 (patch) | |
tree | 39fd1f2b67e8abb803c569b9d68cb9ae2e04887a /chrome/browser/extensions/extension_install_prompt.cc | |
parent | 8190aed1bd6b649f09e1c7e76128d6812ed51398 (diff) | |
download | chromium_src-c8ff7c9eae9ded873df5dcb230f35e78aecd4e36.zip chromium_src-c8ff7c9eae9ded873df5dcb230f35e78aecd4e36.tar.gz chromium_src-c8ff7c9eae9ded873df5dcb230f35e78aecd4e36.tar.bz2 |
Streamlined sideload UI for extensions from the webstore.
http://i.imgur.com/OOjPmDJ.png
Sideloaded extensions that have a webstore update URL have a global error bubble replacing the normal extension install dialog.
Still TODO:
- Making this not appear for new profiles.
- Unit tests.
BUG=229083
Review URL: https://chromiumcodereview.appspot.com/14328029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_install_prompt.cc')
-rw-r--r-- | chrome/browser/extensions/extension_install_prompt.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index fc69e64..eb37b8b 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -520,12 +520,15 @@ void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate, } void ExtensionInstallPrompt::ConfirmExternalInstall( - Delegate* delegate, const Extension* extension) { + Delegate* delegate, + const Extension* extension, + const ShowDialogCallback& show_dialog_callback) { DCHECK(ui_loop_ == MessageLoop::current()); extension_ = extension; permissions_ = extension->GetActivePermissions(); delegate_ = delegate; prompt_.set_type(EXTERNAL_INSTALL_PROMPT); + show_dialog_callback_ = show_dialog_callback; LoadImageIfNeeded(); } |