summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 21:00:40 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 21:00:40 +0000
commit949d0238e22516eb14cafdf12cd1e38d730976cc (patch)
treedc174a21ac94e9d070b3b651ef18f343c37bf650 /chrome
parent2877c97625ecd25a42f5b056eca22804a993d633 (diff)
downloadchromium_src-949d0238e22516eb14cafdf12cd1e38d730976cc.zip
chromium_src-949d0238e22516eb14cafdf12cd1e38d730976cc.tar.gz
chromium_src-949d0238e22516eb14cafdf12cd1e38d730976cc.tar.bz2
Use normal browser window as parent for extension prompt window.
BUG=<http://crosbug.com/1587> TEST=Verify fix for ChromeOS issue 1587. Review URL: http://codereview.chromium.org/2011001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/views/extensions/extension_install_prompt2.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/views/extensions/extension_install_prompt2.cc b/chrome/browser/views/extensions/extension_install_prompt2.cc
index 1bbcb14..1b8387c 100644
--- a/chrome/browser/views/extensions/extension_install_prompt2.cc
+++ b/chrome/browser/views/extensions/extension_install_prompt2.cc
@@ -292,7 +292,14 @@ void InstallDialogContent2::Layout() {
void ExtensionInstallUI::ShowExtensionInstallUIPrompt2Impl(
Profile* profile, Delegate* delegate, Extension* extension, SkBitmap* icon,
const std::vector<string16>& permissions) {
+#if defined(OS_CHROMEOS)
+ // Use a normal browser window as parent on ChromeOS.
+ Browser* browser = BrowserList::FindBrowserWithType(profile,
+ Browser::TYPE_NORMAL,
+ true);
+#else
Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
+#endif
if (!browser) {
delegate->InstallUIAbort();
return;