diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 07:02:48 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 07:02:48 +0000 |
| commit | ff967dcaae01a2e807bff93e26a4b7c9dffe9ed8 (patch) | |
| tree | 682aa27b7afb950f797e8520ac50e0a63c71c838 /views/controls/menu/menu_controller.cc | |
| parent | 9349003401f0c97a8931d38df8fc8ff0a24e7492 (diff) | |
| download | chromium_src-ff967dcaae01a2e807bff93e26a4b7c9dffe9ed8.zip chromium_src-ff967dcaae01a2e807bff93e26a4b7c9dffe9ed8.tar.gz chromium_src-ff967dcaae01a2e807bff93e26a4b7c9dffe9ed8.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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=93744
Review URL: http://codereview.chromium.org/7483014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_controller.cc')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index b2038da..3fae8bc 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -12,11 +12,11 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas_skia.h" +#include "ui/gfx/screen.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_scroll_view_container.h" #include "views/controls/menu/submenu_view.h" #include "views/drag_utils.h" -#include "views/screen.h" #include "views/view_constants.h" #include "views/views_delegate.h" #include "views/widget/root_view.h" @@ -1036,7 +1036,7 @@ void MenuController::UpdateInitialLocation( // Calculate the bounds of the monitor we'll show menus on. Do this once to // avoid repeated system queries for the info. - pending_state_.monitor_bounds = Screen::GetMonitorWorkAreaNearestPoint( + pending_state_.monitor_bounds = gfx::Screen::GetMonitorWorkAreaNearestPoint( bounds.origin()); } @@ -1064,7 +1064,8 @@ bool MenuController::ShowSiblingMenu(SubmenuView* source, return false; } - gfx::NativeWindow window_under_mouse = Screen::GetWindowAtCursorScreenPoint(); + gfx::NativeWindow window_under_mouse = + gfx::Screen::GetWindowAtCursorScreenPoint(); if (window_under_mouse != owner_) return false; |