diff options
| author | robliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 22:49:31 +0000 |
|---|---|---|
| committer | robliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 22:49:31 +0000 |
| commit | 7804332edadb7aea91137aeac932d512d9104ebd (patch) | |
| tree | 10f00b00a044dffbee15ecf53bff1792a38110e9 /ash/wm/drag_window_resizer.cc | |
| parent | b315e837d887efecbefed6ad06ef72e655dc4b99 (diff) | |
| download | chromium_src-7804332edadb7aea91137aeac932d512d9104ebd.zip chromium_src-7804332edadb7aea91137aeac932d512d9104ebd.tar.gz chromium_src-7804332edadb7aea91137aeac932d512d9104ebd.tar.bz2 | |
Revert of Moving coordinate conversion methods from ash/wm to ui/wm. (https://codereview.chromium.org/425363002/)
Reason for revert:
Build break.
../../ash/display/mouse_cursor_event_filter_ozone.cc:21:7:error: no member named 'ConvertPointToScreen' in namespace 'ash::wm'
wm::ConvertPointToScreen(target, &point_in_screen);
~~~~^
../../ash/display/mouse_cursor_event_filter_ozone.cc:45:7:error: no member named 'ConvertPointFromScreen' in namespace 'ash::wm'
wm::ConvertPointFromScreen(root_at_point, &point_in_root);
~~~~^
../../ash/display/mouse_cursor_event_filter_ozone.cc:86:7:error: no member named 'ConvertPointFromScreen' in namespace 'ash::wm'
wm::ConvertPointFromScreen(dst_root, &point_in_dst_screen);
~~~~^
Original issue's description:
> 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
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287609
TBR=oshima@chromium.org,ben@chromium.org,sky@chromium.org,mfomitchev@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=NONE
Review URL: https://codereview.chromium.org/445703005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287626 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, 3 insertions, 4 deletions
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 214dbc5..15b0584 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc @@ -20,7 +20,6 @@ #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 { @@ -80,7 +79,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); @@ -97,8 +96,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); |