diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 01:15:57 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 01:15:57 +0000 |
| commit | 1e218739ae3350c2932a34a6087d539eac65ed1d (patch) | |
| tree | 5fbebafabb1bd4be146bcaa2928ff8b9ccef1d72 /views/controls/button/menu_button.cc | |
| parent | 3b721d82c2d49058a30bd20afb03652b38c59e91 (diff) | |
| download | chromium_src-1e218739ae3350c2932a34a6087d539eac65ed1d.zip chromium_src-1e218739ae3350c2932a34a6087d539eac65ed1d.tar.gz chromium_src-1e218739ae3350c2932a34a6087d539eac65ed1d.tar.bz2 | |
Revert 93744 - 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
TBR=oshima@google.com
Review URL: http://codereview.chromium.org/7488035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93749 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, 2 insertions, 3 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 64f4795..7701d59 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,8 +259,7 @@ int MenuButton::GetMaximumScreenXCoordinate() { } gfx::Rect monitor_bounds = - gfx::Screen::GetMonitorWorkAreaNearestWindow( - GetWidget()->GetTopLevelWidget()->GetNativeView()); + Screen::GetMonitorWorkAreaNearestWindow(GetWidget()->GetNativeView()); return monitor_bounds.right() - 1; } |