Rename WindowTreeHost functions to indicate pixels/dips.

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/aura/wm_window_aura.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
@@ skipping 18 matching lines @@
 namespace ash {
 
 // static
 void ScreenPositionController::ConvertHostPointToRelativeToRootWindow(
     aura::Window* root_window,
     const aura::Window::Windows& root_windows,
     gfx::Point* point,
     aura::Window** target_root) {
   DCHECK(!root_window->parent());
   gfx::Point point_in_root(*point);
-  root_window->GetHost()->ConvertPointFromHost(&point_in_root);
+  root_window->GetHost()->ConvertPixelsToDIP(&point_in_root);
 
 #if defined(USE_X11) || defined(USE_OZONE)
   gfx::Rect host_bounds(root_window->GetHost()->GetBoundsInPixels().size());
   if (!host_bounds.Contains(*point)) {
     // This conversion is necessary to deal with X's passive input
     // grab while dragging window. For example, if we have two
     // displays, say 1000x1000 (primary) and 500x500 (extended one
     // on the right), and start dragging a window at (999, 123), and
     // then move the pointer to the right, the pointer suddenly
     // warps to the extended display. The destination is (0, 123) in
     // the secondary root window's coordinates, or (1000, 123) in
     // the screen coordinates. However, since the mouse is captured
     // by X during drag, a weird LocatedEvent, something like (0, 1123)
     // in the *primary* root window's coordinates, is sent to Chrome
     // (Remember that in the native X11 world, the two root windows
     // are always stacked vertically regardless of the display
     // layout in Ash). We need to figure out that (0, 1123) in the
     // primary root window's coordinates is actually (0, 123) in the
     // extended root window's coordinates.
     //
     // For now Ozone works in a similar manner as X11. Transitioning from one
     // display's coordinate system to anothers may cause events in the
     // primary's coordinate system which fall in the extended display.
 
     gfx::Point location_in_native(point_in_root);
 
-    root_window->GetHost()->ConvertPointToNativeScreen(&location_in_native);
+    root_window->GetHost()->ConvertDIPToScreenInPixels(&location_in_native);
 
     for (size_t i = 0; i < root_windows.size(); ++i) {
       aura::WindowTreeHost* host = root_windows[i]->GetHost();
       const gfx::Rect native_bounds = host->GetBoundsInPixels();
       if (native_bounds.Contains(location_in_native)) {
         *target_root = root_windows[i];
         *point = location_in_native;
-        host->ConvertPointFromNativeScreen(point);
+        host->ConvertScreenInPixelsToDIP(point);
         return;
       }
     }
   }
 #endif
   *target_root = root_window;
   *point = point_in_root;
 }
 
 void ScreenPositionController::ConvertPointToScreen(const aura::Window* window,
@@ skipping 36 matching lines @@
                                          const display::Display& display) {
   if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) {
     window->SetBounds(bounds);
     return;
   }
 
   wm::SetBoundsInScreen(WmWindowAura::Get(window), bounds, display);
 }
 
 }  // namespace ash