From 7804332edadb7aea91137aeac932d512d9104ebd Mon Sep 17 00:00:00 2001 From: "robliao@chromium.org" Date: Tue, 5 Aug 2014 22:49:31 +0000 Subject: 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 --- ash/wm/window_resizer.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ash/wm/window_resizer.cc') diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index fbdc29c..08ff0c4 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc @@ -20,7 +20,6 @@ #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" -#include "ui/wm/core/coordinate_conversion.h" namespace ash { @@ -205,7 +204,7 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( // for the current display but the window can move to a different one. aura::Window* parent = GetTarget()->parent(); gfx::Point passed_location_in_screen(passed_location); - ::wm::ConvertPointToScreen(parent, &passed_location_in_screen); + wm::ConvertPointToScreen(parent, &passed_location_in_screen); gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size()); // Use a pointer location (matching the logic in DragWindowResizer) to // calculate the target display after the drag. -- cgit v1.1