diff options
| author | mfomitchev@chromium.org <mfomitchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 22:06:16 +0000 |
|---|---|---|
| committer | mfomitchev@chromium.org <mfomitchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 22:06:16 +0000 |
| commit | 1ece0b6bc17519c50fd3c15df95060953c082894 (patch) | |
| tree | 7c39fa11c19b7c54fc24fa283b6734a3e37714c2 /ash/wm/drag_window_resizer.cc | |
| parent | 7aa9682d0500b2f8e8db0f80c7d9e32d490e22ee (diff) | |
| download | chromium_src-1ece0b6bc17519c50fd3c15df95060953c082894.zip chromium_src-1ece0b6bc17519c50fd3c15df95060953c082894.tar.gz chromium_src-1ece0b6bc17519c50fd3c15df95060953c082894.tar.bz2 | |
Moving coordinate conversion methods from ash/wm to ui/wm.
Moving ConvertPointToScreen and ConvertPointFromScreen from ash::wm into
aura::Window. The suggestion to do this was made here:
https://codereview.chromium.org/420603011/diff/1/athena/wm/coordinate_conversion.h
BUG=NONE
Review URL: https://codereview.chromium.org/425363002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/drag_window_resizer.cc')
| -rw-r--r-- | ash/wm/drag_window_resizer.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 15b0584..214dbc5 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc @@ -20,6 +20,7 @@ #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/screen.h" +#include "ui/wm/core/coordinate_conversion.h" #include "ui/wm/core/window_util.h" namespace ash { @@ -79,7 +80,7 @@ void DragWindowResizer::Drag(const gfx::Point& location, int event_flags) { // Show a phantom window for dragging in another root window. if (HasSecondaryRootWindow()) { gfx::Point location_in_screen = location; - wm::ConvertPointToScreen(GetTarget()->parent(), &location_in_screen); + ::wm::ConvertPointToScreen(GetTarget()->parent(), &location_in_screen); const bool in_original_root = wm::GetRootWindowAt(location_in_screen) == GetTarget()->GetRootWindow(); UpdateDragWindow(GetTarget()->bounds(), in_original_root); @@ -96,8 +97,8 @@ void DragWindowResizer::CompleteDrag() { // Check if the destination is another display. gfx::Point last_mouse_location_in_screen = last_mouse_location_; - wm::ConvertPointToScreen(GetTarget()->parent(), - &last_mouse_location_in_screen); + ::wm::ConvertPointToScreen(GetTarget()->parent(), + &last_mouse_location_in_screen); gfx::Screen* screen = Shell::GetScreen(); const gfx::Display dst_display = screen->GetDisplayNearestPoint(last_mouse_location_in_screen); |