diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 00:45:11 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 00:45:11 +0000 |
| commit | 1eabfd7a4dd99d9d3eec4e8b2fa0032d00a31093 (patch) | |
| tree | 459ffc42c473ab89a5ae13f45cb578e4a5b289cd /views/controls/button/menu_button.cc | |
| parent | f70f061e17087785320b732ed985a580444464e7 (diff) | |
| download | chromium_src-1eabfd7a4dd99d9d3eec4e8b2fa0032d00a31093.zip chromium_src-1eabfd7a4dd99d9d3eec4e8b2fa0032d00a31093.tar.gz chromium_src-1eabfd7a4dd99d9d3eec4e8b2fa0032d00a31093.tar.bz2 | |
2nd try. added UI_API to Screen class.
Move screen.h to ui/gfx because Screen doesn't depend on views, and they're useful outside views.
BUG=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=93724
Review URL: http://codereview.chromium.org/7483014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button/menu_button.cc')
| -rw-r--r-- | views/controls/button/menu_button.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 7701d59..64f4795 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -12,10 +12,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/screen.h" #include "views/controls/button/button.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/events/event.h" -#include "views/screen.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" @@ -259,7 +259,8 @@ int MenuButton::GetMaximumScreenXCoordinate() { } gfx::Rect monitor_bounds = - Screen::GetMonitorWorkAreaNearestWindow(GetWidget()->GetNativeView()); + gfx::Screen::GetMonitorWorkAreaNearestWindow( + GetWidget()->GetTopLevelWidget()->GetNativeView()); return monitor_bounds.right() - 1; } |