diff options
author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 00:32:14 +0000 |
---|---|---|
committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 00:32:14 +0000 |
commit | ec7d8d2eb4519c83d974d9675cff9e0ef6fbb98f (patch) | |
tree | beeb802ca493d501b698f520854cb1ff01f3dc59 | |
parent | 0406bd1d749dcc769f2f8f98c144803d4c9ed7dd (diff) | |
download | chromium_src-ec7d8d2eb4519c83d974d9675cff9e0ef6fbb98f.zip chromium_src-ec7d8d2eb4519c83d974d9675cff9e0ef6fbb98f.tar.gz chromium_src-ec7d8d2eb4519c83d974d9675cff9e0ef6fbb98f.tar.bz2 |
Merge 69445 - Confirm all extension and app installs in a normal window, even if they were installed in an incognito window.
BUG=62752
TEST=Install extension and app in incognito and normal modes.
Review URL: http://codereview.chromium.org/5942001
TBR=tessamac@google.com
Review URL: http://codereview.chromium.org/6248002
git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71269 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/extensions/extension_install_ui.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index ab023b1..aca3de6 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -133,11 +133,9 @@ void ExtensionInstallUI::OnInstallSuccess(const Extension* extension, return; } - // Note that browser actions don't appear in incognito mode initially, - // so be sure to use a normal browser window. - Profile* profile = profile_; - if (extension->browser_action()) - profile = profile->GetOriginalProfile(); + // Extensions aren't enabled by default in incognito so we confirm + // the install in a normal window. + Profile* profile = profile_->GetOriginalProfile(); Browser* browser = Browser::GetOrCreateTabbedBrowser(profile); if (browser->tab_count() == 0) browser->AddBlankTab(true); |