diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 16:53:22 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 16:53:22 +0000 |
| commit | 2dc56b16e8b0d69ca6a0f8d8a1f916ee7bc6b3b2 (patch) | |
| tree | adf440ed43d7ffb85f1cd6cd29270dbc18784f58 /chrome/browser | |
| parent | d0937f36aa7a3a073cfbec8722ae7ee1dd9a3354 (diff) | |
| download | chromium_src-2dc56b16e8b0d69ca6a0f8d8a1f916ee7bc6b3b2.zip chromium_src-2dc56b16e8b0d69ca6a0f8d8a1f916ee7bc6b3b2.tar.gz chromium_src-2dc56b16e8b0d69ca6a0f8d8a1f916ee7bc6b3b2.tar.bz2 | |
Fix a bug where opening an extension options tab from a sole incognito window
would fail to show the new window.
BUG=41526
Review URL: http://codereview.chromium.org/1545041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/extensions/extension_process_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_module.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 7432102..2ef98d0 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -5,6 +5,7 @@ #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/browser.h" +#include "chrome/browser/browser_window.h" #include "chrome/browser/browsing_instance.h" #if defined(OS_MACOSX) #include "chrome/browser/extensions/extension_host_mac.h" @@ -156,6 +157,7 @@ void ExtensionProcessManager::OpenOptionsPage(Extension* extension, browser->OpenURL(extension->options_url(), GURL(), SINGLETON_TAB, PageTransition::LINK); + browser->window()->Show(); browser->GetSelectedTabContents()->Activate(); } diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index 17058af..1ac66b7 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -594,6 +594,7 @@ bool CreateTabFunction::RunImpl() { TabContents* contents = browser->AddTabWithURL(url, GURL(), PageTransition::LINK, selected, index, true, NULL); index = tab_strip->GetIndexOfTabContents(contents); + browser->window()->Show(); if (selected) contents->Focus(); |