Convert Aura to use ui::Event.

ash/display/screen_position_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/display/screen_position_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 38 matching lines @@
 }
 
 }  // namespace
 
 namespace internal {
 
 void ScreenPositionController::ConvertPointToScreen(
     const aura::Window* window,
     gfx::Point* point) {
   const aura::RootWindow* root = window->GetRootWindow();
-  aura::Window::ConvertPointToWindow(window, root, point);
+  aura::Window::ConvertPointToTarget(window, root, point);
   if (DisplayController::IsExtendedDesktopEnabled()) {
     const gfx::Point display_origin =
         gfx::Screen::GetDisplayNearestWindow(
             const_cast<aura::RootWindow*>(root)).bounds().origin();
     point->Offset(display_origin.x(), display_origin.y());
   }
 }
 
 void ScreenPositionController::ConvertPointFromScreen(
     const aura::Window* window,
     gfx::Point* point) {
   const aura::RootWindow* root = window->GetRootWindow();
   if (DisplayController::IsExtendedDesktopEnabled()) {
     const gfx::Point display_origin =
         gfx::Screen::GetDisplayNearestWindow(
             const_cast<aura::RootWindow*>(root)).bounds().origin();
     point->Offset(-display_origin.x(), -display_origin.y());
   }
-  aura::Window::ConvertPointToWindow(root, window, point);
+  aura::Window::ConvertPointToTarget(root, window, point);
 }
 
 void ScreenPositionController::SetBounds(
     aura::Window* window,
     const gfx::Rect& bounds) {
   if (!DisplayController::IsExtendedDesktopEnabled() ||
       !window->parent()->GetProperty(internal::kUsesScreenCoordinatesKey)) {
     window->SetBounds(bounds);
     return;
   }
@@ skipping 39 matching lines @@
 
   gfx::Point origin(bounds.origin());
   const gfx::Point display_origin =
       gfx::Screen::GetDisplayNearestWindow(window).bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds.size()));
 }
 
 }  // internal
 }  // ash