Moving coordinate conversion methods from ash/wm to ui/wm.

ash/autoclick/autoclick_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/autoclick/autoclick_controller.h"
 
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "base/timer/timer.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_processor.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/vector2d.h"
+#include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
 
 // The threshold of mouse movement measured in DIP that will
 // initiate a new autoclick.
 const int kMovementThreshold = 20;
 
 bool IsModifierKey(ui::KeyboardCode key_code) {
@@ skipping 93 matching lines @@
                  base::Unretained(this)),
       false));
 }
 
 void AutoclickControllerImpl::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_MOVED &&
       !(event->flags() & ui::EF_IS_SYNTHESIZED)) {
     mouse_event_flags_ = event->flags();
 
     gfx::Point mouse_location = event->root_location();
-    ash::wm::ConvertPointToScreen(
-        wm::GetRootWindowAt(mouse_location),
-        &mouse_location);
+    ::wm::ConvertPointToScreen(wm::GetRootWindowAt(mouse_location),
+                               &mouse_location);
 
     // The distance between the mouse location and the anchor location
     // must exceed a certain threshold to initiate a new autoclick countdown.
     // This ensures that mouse jitter caused by poor motor control does not
     // 1. initiate an unwanted autoclick from rest
     // 2. prevent the autoclick from ever occuring when the mouse
     //    arrives at the target.
     gfx::Vector2d delta = mouse_location - anchor_location_;
     if (delta.LengthSquared() >= kMovementThreshold * kMovementThreshold) {
       anchor_location_ = event->root_location();
@@ skipping 34 matching lines @@
 }
 
 void AutoclickControllerImpl::DoAutoclick() {
   gfx::Point screen_location =
       aura::Env::GetInstance()->last_mouse_location();
   aura::Window* root_window = wm::GetRootWindowAt(screen_location);
   DCHECK(root_window) << "Root window not found while attempting autoclick.";
 
   gfx::Point click_location(screen_location);
   anchor_location_ = click_location;
-  wm::ConvertPointFromScreen(root_window, &click_location);
+  ::wm::ConvertPointFromScreen(root_window, &click_location);
 
   aura::WindowTreeHost* host = root_window->GetHost();
   host->ConvertPointToHost(&click_location);
 
   ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED,
                              click_location,
                              click_location,
                              mouse_event_flags_ | ui::EF_LEFT_MOUSE_BUTTON,
                              ui::EF_LEFT_MOUSE_BUTTON);
   ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED,
                                click_location,
                                click_location,
                                mouse_event_flags_ | ui::EF_LEFT_MOUSE_BUTTON,
                                ui::EF_LEFT_MOUSE_BUTTON);
 
   ui::EventDispatchDetails details =
       host->event_processor()->OnEventFromSource(&press_event);
   if (!details.dispatcher_destroyed)
     details = host->event_processor()->OnEventFromSource(&release_event);
   if (details.dispatcher_destroyed)
     return;
 }
 
 // static.
 AutoclickController* AutoclickController::CreateInstance() {
   return new AutoclickControllerImpl();
 }
 
 }  // namespace ash