diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 18:03:47 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 18:03:47 +0000 |
commit | 08a3b713ae113c58893e7daddbbc4afd178d446f (patch) | |
tree | d2f1dee12be5cb34f4acdc1cf269021e5948a7ef /views/window | |
parent | 56008bf3dc79ab9d76f09769317ac4307c385b08 (diff) | |
download | chromium_src-08a3b713ae113c58893e7daddbbc4afd178d446f.zip chromium_src-08a3b713ae113c58893e7daddbbc4afd178d446f.tar.gz chromium_src-08a3b713ae113c58893e7daddbbc4afd178d446f.tar.bz2 |
Fixes regression in menu button. I converted a call from GetWidget to
GetWindow, the problem is in certain scenarios GetWindow can return
null. I've changed the code back to GetWidget and converted Screen
from taking a NativeWindow to a NativeView.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/269076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r-- | views/window/window_gtk.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc index 8f64a5b3..a3a3192 100644 --- a/views/window/window_gtk.cc +++ b/views/window/window_gtk.cc @@ -442,7 +442,7 @@ void WindowGtk::SizeWindowToDefault(GtkWindow* parent) { center_rect = gfx::Rect(parent_x, parent_y, parent_w, parent_h); } else { // We have no parent window, center over the screen. - center_rect = Screen::GetMonitorWorkAreaNearestWindow(GetNativeWindow()); + center_rect = Screen::GetMonitorWorkAreaNearestWindow(GetNativeView()); } gfx::Size size = non_client_view_->GetPreferredSize(); gfx::Rect bounds(center_rect.x() + (center_rect.width() - size.width()) / 2, |