diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-14 03:13:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-14 03:13:06 +0000 |
| commit | e56bbc990c6855f286ebf74e88e1bca0227fe210 (patch) | |
| tree | 5ed565ac79a99800fa5cc66b65d52dd40a61a032 /chrome/browser/views/hung_renderer_view.cc | |
| parent | 6b33e4da472b3c474a3f1328fdba4a84d4a91886 (diff) | |
| download | chromium_src-e56bbc990c6855f286ebf74e88e1bca0227fe210.zip chromium_src-e56bbc990c6855f286ebf74e88e1bca0227fe210.tar.gz chromium_src-e56bbc990c6855f286ebf74e88e1bca0227fe210.tar.bz2 | |
rollback again
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/hung_renderer_view.cc')
| -rw-r--r-- | chrome/browser/views/hung_renderer_view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index ef78677..4dc72f6 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -225,7 +225,7 @@ void HungRendererWarningView::ShowForWebContents(WebContents* contents) { HWND frame_hwnd = GetAncestor(contents->GetNativeView(), GA_ROOT); HWND foreground_window = GetForegroundWindow(); if (foreground_window != frame_hwnd && - foreground_window != window()->GetNativeWindow()) { + foreground_window != window()->GetNativeView()) { return; } @@ -403,7 +403,8 @@ gfx::Rect HungRendererWarningView::GetDisplayBounds( CRect contents_bounds; GetWindowRect(contents_hwnd, &contents_bounds); - gfx::Rect window_bounds = window()->GetBounds(); + gfx::Rect window_bounds; + window()->GetBounds(&window_bounds, true); int window_x = contents_bounds.left + (contents_bounds.Width() - window_bounds.width()) / 2; |