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/controls/button | |
| 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/controls/button')
| -rw-r--r-- | views/controls/button/menu_button.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 7f1daf7..5dc59cb 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -103,13 +103,13 @@ void MenuButton::Paint(gfx::Canvas* canvas, bool for_drag) { //////////////////////////////////////////////////////////////////////////////// int MenuButton::GetMaximumScreenXCoordinate() { - if (!GetWindow()) { + if (!GetWidget()) { NOTREACHED(); return 0; } gfx::Rect monitor_bounds = - Screen::GetMonitorWorkAreaNearestWindow(GetWindow()->GetNativeWindow()); + Screen::GetMonitorWorkAreaNearestWindow(GetWidget()->GetNativeView()); return monitor_bounds.right() - 1; } |