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

ash/wm/workspace/multi_window_resize_controller.cc

 // Copyright (c) 2012 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/wm/workspace/multi_window_resize_controller.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/compound_event_filter.h"
-#include "ui/wm/core/coordinate_conversion.h"
 
 using aura::Window;
 
 namespace ash {
 namespace {
 
 // Delay before showing.
 const int kShowDelayMS = 400;
 
 // Delay before hiding.
@@ skipping 183 matching lines @@
   // Have to explicitly reset the WindowResizer, otherwise Hide() does nothing.
   window_resizer_.reset();
   Hide();
 }
 
 MultiWindowResizeController::ResizeWindows
 MultiWindowResizeController::DetermineWindowsFromScreenPoint(
     aura::Window* window) const {
   gfx::Point mouse_location(
       gfx::Screen::GetScreenFor(window)->GetCursorScreenPoint());
-  ::wm::ConvertPointFromScreen(window, &mouse_location);
+  wm::ConvertPointFromScreen(window, &mouse_location);
   const int component =
       window->delegate()->GetNonClientComponent(mouse_location);
   return DetermineWindows(window, component, mouse_location);
 }
 
 MultiWindowResizeController::ResizeWindows
 MultiWindowResizeController::DetermineWindows(
     Window* window,
     int window_component,
     const gfx::Point& point) const {
@@ skipping 291 matching lines @@
     return false;
 
   gfx::Point window_loc(location_in_screen);
   aura::Window::ConvertPointToTarget(
       window->GetRootWindow(), window, &window_loc);
   return window->ContainsPoint(window_loc) &&
       window->delegate()->GetNonClientComponent(window_loc) == component;
 }
 
 }  // namespace ash