diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 21:17:42 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 21:17:42 +0000 |
| commit | b552ca1fcf241f8f4dcbde8e0e9440aa661fa853 (patch) | |
| tree | c54e4ec607b6bbf0578c7acb30b8b8f934ad2971 /chrome/browser/views/frame | |
| parent | d2652ad17b4303f682e391d13767ea91f5a16693 (diff) | |
| download | chromium_src-b552ca1fcf241f8f4dcbde8e0e9440aa661fa853.zip chromium_src-b552ca1fcf241f8f4dcbde8e0e9440aa661fa853.tar.gz chromium_src-b552ca1fcf241f8f4dcbde8e0e9440aa661fa853.tar.bz2 | |
Use normal browser window as PageInfoView's parent rather than the popup browser window.
BUG=<http://crosbug.com/2783>
TEST=Verify fix for ChromeOS issue 2783.
Review URL: http://codereview.chromium.org/2007004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 15 |
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() { |