Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ash / test / ui_controls_factory_ash.cc

diff --git a/src/ash/test/ui_controls_factory_ash.cc b/src/ash/test/ui_controls_factory_ash.cc
index b8393e5..ef39464 100644 (file)
--- a/src/ash/test/ui_controls_factory_ash.cc
+++ b/src/ash/test/ui_controls_factory_ash.cc
@@ -42,20 +42,10 @@ UIControlsAura* GetUIControlsForRootWindow(aura::Window* root_window) {
   return native_ui_control;
 }
 
-// Returns the UIControls object for the RootWindow at the |point_in_screen|
-// in virtual screen coordinates, and updates the |point| relative to the
-// UIControlsAura's root window.  NULL if there is no RootWindow under
-// the |point_in_screen|.
-UIControlsAura* GetUIControlsAt(gfx::Point* point_in_screen) {
+// Returns the UIControls object for the RootWindow at |point_in_screen|.
+UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) {
   // TODO(mazda): Support the case passive grab is taken.
-  aura::Window* root = ash::wm::GetRootWindowAt(*point_in_screen);
-
-  aura::client::ScreenPositionClient* screen_position_client =
-      aura::client::GetScreenPositionClient(root);
-  if (screen_position_client)
-    screen_position_client->ConvertPointFromScreen(root, point_in_screen);
-
-  return GetUIControlsForRootWindow(root);
+  return GetUIControlsForRootWindow(ash::wm::GetRootWindowAt(point_in_screen));
 }
 
 }  // namespace
@@ -95,7 +85,7 @@ class UIControlsAsh : public UIControlsAura {
 
   virtual bool SendMouseMove(long x, long y) OVERRIDE {
     gfx::Point p(x, y);
-    UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseMove(p.x(), p.y());
   }
 
@@ -104,28 +94,28 @@ class UIControlsAsh : public UIControlsAura {
       long y,
       const base::Closure& closure) OVERRIDE {
     gfx::Point p(x, y);
-    UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls &&
         ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure);
   }
 
   virtual bool SendMouseEvents(MouseButton type, int state) OVERRIDE {
     gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
-    UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseEvents(type, state);
   }
 
   virtual bool SendMouseEventsNotifyWhenDone(
       MouseButton type, int state, const base::Closure& closure) OVERRIDE {
     gfx::Point p(aura::Env::GetInstance()->last_mouse_location());
-    UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone(
         type, state, closure);
   }
 
   virtual bool SendMouseClick(MouseButton type) OVERRIDE {
     gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
-    UIControlsAura* ui_controls = GetUIControlsAt(&p);
+    UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseClick(type);
   }