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/mouse_watcher.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/mouse_watcher.cc')
| -rw-r--r-- | views/mouse_watcher.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/mouse_watcher.cc b/views/mouse_watcher.cc index 09aaa8a..810db69 100644 --- a/views/mouse_watcher.cc +++ b/views/mouse_watcher.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/task.h" -#include "views/screen.h" +#include "ui/gfx/screen.h" #include "views/view.h" #include "views/widget/widget.h" @@ -89,7 +89,7 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer { bounds.width() + mouse_watcher_->hot_zone_insets_.width(), bounds.height() + mouse_watcher_->hot_zone_insets_.height()); - gfx::Point cursor_point = Screen::GetCursorScreenPoint(); + gfx::Point cursor_point = gfx::Screen::GetCursorScreenPoint(); return bounds.Contains(cursor_point.x(), cursor_point.y()); } @@ -100,7 +100,7 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer { if (!widget) return false; - return Screen::GetWindowAtCursorScreenPoint() == + return gfx::Screen::GetWindowAtCursorScreenPoint() == widget->GetNativeWindow(); } |