diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 18:27:46 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 18:27:46 +0000 |
| commit | 7203a5ecc10ca59ef838d4e31dc4566cd1b33780 (patch) | |
| tree | 60b69c2c4845eebffbeeecf8c9d8280863d81354 /ash/ui_controls_ash.cc | |
| parent | 8fee1c35d91f2984c9a738008d5728e893ef91a5 (diff) | |
| download | chromium_src-7203a5ecc10ca59ef838d4e31dc4566cd1b33780.zip chromium_src-7203a5ecc10ca59ef838d4e31dc4566cd1b33780.tar.gz chromium_src-7203a5ecc10ca59ef838d4e31dc4566cd1b33780.tar.bz2 | |
Allow the cursor to warp even when a window is dragged.
This is the first step toward implementing crbug.com/136816 (Implement dragging window from one display to another).
BUG=136816
TEST=try
Review URL: https://chromiumcodereview.appspot.com/10835047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ui_controls_ash.cc')
| -rw-r--r-- | ash/ui_controls_ash.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/ui_controls_ash.cc b/ash/ui_controls_ash.cc index 6069c61..4c60c54 100644 --- a/ash/ui_controls_ash.cc +++ b/ash/ui_controls_ash.cc @@ -4,6 +4,7 @@ #include "ash/shell.h" #include "ash/shell_factory.h" +#include "ash/wm/coordinate_conversion.h" #include "ash/wm/window_properties.h" #include "ui/aura/root_window.h" #include "ui/aura/ui_controls_aura.h" @@ -33,7 +34,7 @@ ui_controls::UIControlsAura* GetUIControlsForRootWindow( // absolute screen coordinates. NULL if there is no RootWindow under the // |point|. ui_controls::UIControlsAura* GetUIControlsAt(const gfx::Point& point) { - aura::RootWindow* root = Shell::GetRootWindowAt(point); + aura::RootWindow* root = wm::GetRootWindowAt(point); return root ? GetUIControlsForRootWindow(root) : NULL; } |