Rename WindowTreeHost functions to indicate pixels/dips.

ash/display/display_util.cc

 // Copyright 2014 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/display_util.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/system/system_notifier.h"
@@ skipping 49 matching lines @@
   // Private destructor since NotificationDelegate is ref-counted.
   ~DisplayErrorNotificationDelegate() override = default;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayErrorNotificationDelegate);
 };
 
 
 void ConvertPointFromScreenToNative(aura::WindowTreeHost* host,
                                     gfx::Point* point) {
   ::wm::ConvertPointFromScreen(host->window(), point);
-  host->ConvertPointToNativeScreen(point);
+  host->ConvertDIPToScreenInPixels(point);
 }
 
 }  // namespace
 
 std::unique_ptr<MouseWarpController> CreateMouseWarpController(
     display::DisplayManager* manager,
     aura::Window* drag_source) {
   if (manager->IsInUnifiedMode() && manager->num_connected_displays() >= 2)
     return base::MakeUnique<UnifiedMouseWarpController>();
   // Extra check for |num_connected_displays()| is for SystemDisplayApiTest
@@ skipping 35 matching lines @@
 }
 
 // Moves the cursor to the point inside the root that is closest to
 // the point_in_screen, which is outside of the root window.
 void MoveCursorTo(AshWindowTreeHost* ash_host,
                   const gfx::Point& point_in_screen,
                   bool update_last_location_now) {
   aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
   gfx::Point point_in_native = point_in_screen;
   ::wm::ConvertPointFromScreen(host->window(), &point_in_native);
-  host->ConvertPointToNativeScreen(&point_in_native);
+  host->ConvertDIPToScreenInPixels(&point_in_native);
 
   // now fit the point inside the native bounds.
   gfx::Rect native_bounds = host->GetBoundsInPixels();
   gfx::Point native_origin = native_bounds.origin();
   native_bounds.Inset(ash_host->GetHostInsets());
   // Shrink further so that the mouse doesn't warp on the
   // edge. The right/bottom needs to be shrink by 2 to subtract
   // the 1 px from width/height value.
   native_bounds.Inset(1, 1, 2, 2);
 
   // Ensure that |point_in_native| is inside the |native_bounds|.
   point_in_native.SetToMax(native_bounds.origin());
   point_in_native.SetToMin(native_bounds.bottom_right());
 
   gfx::Point point_in_host = point_in_native;
 
   point_in_host.Offset(-native_origin.x(), -native_origin.y());
-  host->MoveCursorToHostLocation(point_in_host);
+  host->MoveCursorToLocationInPixels(point_in_host);
 
   if (update_last_location_now) {
     gfx::Point new_point_in_screen;
     if (Shell::GetInstance()->display_manager()->IsInUnifiedMode()) {
       new_point_in_screen = point_in_host;
       // First convert to the unified host.
-      host->ConvertPointFromHost(&new_point_in_screen);
+      host->ConvertPixelsToDIP(&new_point_in_screen);
       // Then convert to the unified screen.
-      Shell::GetPrimaryRootWindow()->GetHost()->ConvertPointFromHost(
+      Shell::GetPrimaryRootWindow()->GetHost()->ConvertPixelsToDIP(
           &new_point_in_screen);
     } else {
       new_point_in_screen = point_in_native;
-      host->ConvertPointFromNativeScreen(&new_point_in_screen);
+      host->ConvertScreenInPixelsToDIP(&new_point_in_screen);
       ::wm::ConvertPointToScreen(host->window(), &new_point_in_screen);
     }
     aura::Env::GetInstance()->set_last_mouse_location(new_point_in_screen);
   }
 }
 
 
 #if defined(OS_CHROMEOS)
 void ShowDisplayErrorNotification(int message_id) {
   // Always remove the notification to make sure the notification appears
@@ skipping 23 matching lines @@
   message_center::NotificationList::Notifications notifications =
       message_center::MessageCenter::Get()->GetVisibleNotifications();
   for (auto* const notification : notifications) {
     if (notification->id() == kDisplayErrorNotificationId)
       return notification->message();
   }
   return base::string16();
 }
 
 }  // namespace ash