Rename WindowTreeHost functions to indicate pixels/dips.

ui/views/mus/desktop_window_tree_host_mus.cc

 // Copyright 2016 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/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 153 matching lines @@
   SetHitTestMask(mask_rect);
 }
 
 float DesktopWindowTreeHostMus::GetScaleFactor() const {
   // TODO(sky): GetDisplayNearestWindow() should take a const aura::Window*.
   return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(const_cast<aura::Window*>(window()))
       .device_scale_factor();
 }
 
-void DesktopWindowTreeHostMus::SetBoundsInDips(
-    const gfx::Rect& bounds_in_dips) {
-  SetBoundsInPixels(gfx::ConvertRectToPixel(GetScaleFactor(), bounds_in_dips));
+void DesktopWindowTreeHostMus::SetBoundsInDIP(const gfx::Rect& bounds_in_dip) {
+  SetBoundsInPixels(gfx::ConvertRectToPixel(GetScaleFactor(), bounds_in_dip));
 }
 
 void DesktopWindowTreeHostMus::Init(aura::Window* content_window,
                                     const Widget::InitParams& params) {
   if (!params.bounds.IsEmpty())
-    SetBoundsInDips(params.bounds);
+    SetBoundsInDIP(params.bounds);
 }
 
 void DesktopWindowTreeHostMus::OnNativeWidgetCreated(
     const Widget::InitParams& params) {
   if (params.parent && params.parent->GetHost()) {
     parent_ = static_cast<DesktopWindowTreeHostMus*>(params.parent->GetHost());
     parent_->children_.insert(this);
   }
   native_widget_delegate_->OnNativeWidgetCreated(true);
 }
@@ skipping 83 matching lines @@
           static_cast<const internal::NativeWidgetPrivate*>(
               parent_->desktop_native_widget_aura_)
               ->IsVisible());
 }
 
 void DesktopWindowTreeHostMus::SetSize(const gfx::Size& size) {
   // Use GetBounds() as the origin of window() is always at 0, 0.
   gfx::Rect screen_bounds =
       gfx::ConvertRectToDIP(GetScaleFactor(), GetBoundsInPixels());
   screen_bounds.set_size(size);
-  SetBoundsInDips(screen_bounds);
+  SetBoundsInDIP(screen_bounds);
 }
 
 void DesktopWindowTreeHostMus::StackAbove(aura::Window* window) {
   // TODO: implement window stacking, http://crbug.com/663617.
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::StackAtTop() {
   // TODO: implement window stacking, http://crbug.com/663617.
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::CenterWindow(const gfx::Size& size) {
   gfx::Rect bounds_to_center_in = GetWorkAreaBoundsInScreen();
 
   // If there is a transient parent and it fits |size|, then center over it.
   aura::Window* content_window = desktop_native_widget_aura_->content_window();
   if (wm::GetTransientParent(content_window)) {
     gfx::Rect transient_parent_bounds =
         wm::GetTransientParent(content_window)->GetBoundsInScreen();
     if (transient_parent_bounds.height() >= size.height() &&
         transient_parent_bounds.width() >= size.width()) {
       bounds_to_center_in = transient_parent_bounds;
     }
   }
 
   gfx::Rect resulting_bounds(bounds_to_center_in);
   resulting_bounds.ClampToCenteredSize(size);
-  SetBoundsInDips(resulting_bounds);
+  SetBoundsInDIP(resulting_bounds);
 }
 
 void DesktopWindowTreeHostMus::GetWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
   // Implementation matches that of NativeWidgetAura.
   *bounds = GetRestoredBounds();
   *show_state = window()->GetProperty(aura::client::kShowStateKey);
 }
 
@@ skipping 267 matching lines @@
   if (window == this->window()) {
     is_active_ = true;
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
     is_active_ = false;
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views