Rename WindowTreeHost functions to indicate pixels/dips.

ui/chromeos/touch_exploration_controller.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 "ui/chromeos/touch_exploration_controller.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 44 matching lines @@
   root_window->GetHost()->GetEventSource()->AddEventRewriter(this);
 }
 
 TouchExplorationController::~TouchExplorationController() {
   root_window_->GetHost()->GetEventSource()->RemoveEventRewriter(this);
 }
 
 void TouchExplorationController::SetTouchAccessibilityAnchorPoint(
     const gfx::Point& anchor_point) {
   gfx::Point native_point = anchor_point;
-  root_window_->GetHost()->ConvertPointToNativeScreen(&native_point);
+  root_window_->GetHost()->ConvertDIPToScreenInPixels(&native_point);
 
   anchor_point_ = gfx::PointF(native_point.x(), native_point.y());
   anchor_point_state_ = ANCHOR_POINT_EXPLICITLY_SET;
 }
 
 void TouchExplorationController::SetExcludeBounds(const gfx::Rect& bounds) {
   exclude_bounds_ = bounds;
 }
 
 ui::EventRewriteStatus TouchExplorationController::RewriteEvent(
@@ skipping 10 matching lines @@
     return ui::EVENT_REWRITE_CONTINUE;
   }
   const ui::TouchEvent& touch_event = static_cast<const ui::TouchEvent&>(event);
 
   // Let TouchAccessibilityEnabler process the unrewritten event.
   if (touch_accessibility_enabler_)
     touch_accessibility_enabler_->HandleTouchEvent(touch_event);
 
   if (!exclude_bounds_.IsEmpty()) {
     gfx::Point location = touch_event.location();
-    root_window_->GetHost()->ConvertPointFromNativeScreen(&location);
+    root_window_->GetHost()->ConvertScreenInPixelsToDIP(&location);
     bool in_exclude_area = exclude_bounds_.Contains(location);
     if (in_exclude_area) {
       if (state_ == NO_FINGERS_DOWN)
         return ui::EVENT_REWRITE_CONTINUE;
       if (touch_event.type() == ui::ET_TOUCH_MOVED ||
           touch_event.type() == ui::ET_TOUCH_PRESSED) {
         return ui::EVENT_REWRITE_DISCARD;
       }
       // Otherwise, continue handling events. Basically, we want to let
       // CANCELLED or RELEASE events through so this can get back to
@@ skipping 787 matching lines @@
   if (edge & TOP_EDGE) {
     delegate_->SetOutputLevel(100);
     return;
   }
   if (edge & BOTTOM_EDGE) {
     delegate_->SetOutputLevel(0);
     return;
   }
 
   location = gesture->location();
-  root_window_->GetHost()->ConvertPointFromNativeScreen(&location);
+  root_window_->GetHost()->ConvertScreenInPixelsToDIP(&location);
   float volume_adjust_height =
       root_window_->bounds().height() - 2 * kMaxDistanceFromEdge;
   float ratio = (location.y() - kMaxDistanceFromEdge) / volume_adjust_height;
   float volume = 100 - 100 * ratio;
   if (VLOG_on_) {
     VLOG(1) << "\n Volume = " << volume
             << "\n Location = " << location.ToString()
             << "\n Bounds = " << root_window_->bounds().right();
   }
   delegate_->SetOutputLevel(static_cast<int>(volume));
@@ skipping 81 matching lines @@
   }
 
   if (gesture != ui::AX_GESTURE_NONE)
     delegate_->HandleAccessibilityGesture(gesture);
 }
 
 int TouchExplorationController::FindEdgesWithinBounds(gfx::Point point,
                                                       float bounds) {
   // Since GetBoundsInScreen is in DIPs but point is not, then point needs to be
   // converted.
-  root_window_->GetHost()->ConvertPointFromNativeScreen(&point);
+  root_window_->GetHost()->ConvertScreenInPixelsToDIP(&point);
   gfx::Rect window = root_window_->GetBoundsInScreen();
 
   float left_edge_limit = window.x() + bounds;
   float right_edge_limit = window.right() - bounds;
   float top_edge_limit = window.y() + bounds;
   float bottom_edge_limit = window.bottom() - bounds;
 
   // Bitwise manipulation in order to determine where on the screen the point
   // lies. If more than one bit is turned on, then it is a corner where the two
   // bit/edges intersect. Otherwise, if no bits are turned on, the point must be
@@ skipping 173 matching lines @@
       return "TWO_FINGER_TAP";
   }
   return "Not a state";
 }
 
 float TouchExplorationController::GetSplitTapTouchSlop() {
   return gesture_detector_config_.touch_slop * 3;
 }
 
 }  // namespace ui