summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views/frame')
-rw-r--r--chrome/browser/views/frame/browser_view.cc15
1 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index ade9dc0..1a4fdd2 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1094,8 +1094,19 @@ void BrowserView::ShowPageInfo(Profile* profile,
const GURL& url,
const NavigationEntry::SSLStatus& ssl,
bool show_history) {
- browser::ShowPageInfo(GetWindow()->GetNativeWindow(), profile, url, ssl,
- show_history);
+ gfx::NativeWindow parent = GetWindow()->GetNativeWindow();
+
+#if defined(OS_CHROMEOS)
+ // Use normal browser window as parent window for ChromeOS.
+ if (!IsBrowserTypeNormal()) {
+ Browser* browser = BrowserList::FindBrowserWithType(profile,
+ Browser::TYPE_NORMAL, true);
+ if (browser && browser->window())
+ parent = browser->window()->GetNativeHandle();
+ }
+#endif // defined(OS_CHROMEOS)
+
+ browser::ShowPageInfo(parent, profile, url, ssl, show_history);
}
void BrowserView::ShowPageMenu() {