Rename WindowTreeHost G|SetBounds to indicate they are in pixels.

ui/views/widget/desktop_aura/desktop_window_tree_host_win.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 "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
 
 #include "base/memory/ptr_util.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 486 matching lines @@
 
 void DesktopWindowTreeHostWin::ShowImpl() {
   message_handler_->Show();
 }
 
 void DesktopWindowTreeHostWin::HideImpl() {
   if (!pending_close_)
     message_handler_->Hide();
 }
 
-// GetBounds and SetBounds work in pixel coordinates, whereas other get/set
-// methods work in DIP.
+// GetBoundsInPixels and SetBoundsInPixels work in pixel coordinates, whereas
+// other get/set methods work in DIP.
 
-gfx::Rect DesktopWindowTreeHostWin::GetBounds() const {
+gfx::Rect DesktopWindowTreeHostWin::GetBoundsInPixels() const {
   gfx::Rect bounds(message_handler_->GetClientAreaBounds());
   // If the window bounds were expanded we need to return the original bounds
   // To achieve this we do the reverse of the expansion, i.e. add the
   // window_expansion_top_left_delta_ to the origin and subtract the
   // window_expansion_bottom_right_delta_ from the width and height.
   gfx::Rect without_expansion(
       bounds.x() + window_expansion_top_left_delta_.x(),
       bounds.y() + window_expansion_top_left_delta_.y(),
       bounds.width() - window_expansion_bottom_right_delta_.x() -
           window_enlargement_.x(),
       bounds.height() - window_expansion_bottom_right_delta_.y() -
           window_enlargement_.y());
   return without_expansion;
 }
 
-void DesktopWindowTreeHostWin::SetBounds(const gfx::Rect& bounds) {
+void DesktopWindowTreeHostWin::SetBoundsInPixels(const gfx::Rect& bounds) {
   // If the window bounds have to be expanded we need to subtract the
   // window_expansion_top_left_delta_ from the origin and add the
   // window_expansion_bottom_right_delta_ to the width and height
-  gfx::Size old_content_size = GetBounds().size();
+  gfx::Size old_content_size = GetBoundsInPixels().size();
 
   gfx::Rect expanded(
       bounds.x() - window_expansion_top_left_delta_.x(),
       bounds.y() - window_expansion_top_left_delta_.y(),
       bounds.width() + window_expansion_bottom_right_delta_.x(),
       bounds.height() + window_expansion_bottom_right_delta_.y());
 
   gfx::Rect new_expanded(
       expanded.origin(),
       GetExpandedWindowSize(message_handler_->window_ex_style(),
                             expanded.size()));
   window_enlargement_ =
       gfx::Vector2d(new_expanded.width() - expanded.width(),
                     new_expanded.height() - expanded.height());
   message_handler_->SetBounds(new_expanded, old_content_size != bounds.size());
 }
 
 gfx::Point DesktopWindowTreeHostWin::GetLocationOnNativeScreen() const {
-  return GetBounds().origin();
+  return GetBoundsInPixels().origin();
 }
 
 void DesktopWindowTreeHostWin::SetCapture() {
   message_handler_->SetCapture();
 }
 
 void DesktopWindowTreeHostWin::ReleaseCapture() {
   message_handler_->ReleaseCapture();
 }
 
@@ skipping 16 matching lines @@
   ::ClientToScreen(GetHWND(), &cursor_location);
   ::SetCursorPos(cursor_location.x, cursor_location.y);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHostWin, aura::AnimationHost implementation:
 
 void DesktopWindowTreeHostWin::SetHostTransitionOffsets(
     const gfx::Vector2d& top_left_delta,
     const gfx::Vector2d& bottom_right_delta) {
-  gfx::Rect bounds_without_expansion = GetBounds();
+  gfx::Rect bounds_without_expansion = GetBoundsInPixels();
   window_expansion_top_left_delta_ = top_left_delta;
   window_expansion_bottom_right_delta_ = bottom_right_delta;
-  SetBounds(bounds_without_expansion);
+  SetBoundsInPixels(bounds_without_expansion);
 }
 
 void DesktopWindowTreeHostWin::OnWindowHidingAnimationCompleted() {
   if (pending_close_)
     message_handler_->Close();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHostWin, HWNDMessageHandlerDelegate implementation:
 
@@ skipping 186 matching lines @@
 void DesktopWindowTreeHostWin::HandleBeginWMSizeMove() {
   native_widget_delegate_->OnNativeWidgetBeginUserBoundsChange();
 }
 
 void DesktopWindowTreeHostWin::HandleEndWMSizeMove() {
   native_widget_delegate_->OnNativeWidgetEndUserBoundsChange();
 }
 
 void DesktopWindowTreeHostWin::HandleMove() {
   native_widget_delegate_->OnNativeWidgetMove();
-  OnHostMoved(GetBounds().origin());
+  OnHostMoved(GetBoundsInPixels().origin());
 }
 
 void DesktopWindowTreeHostWin::HandleWorkAreaChanged() {
   GetWidget()->widget_delegate()->OnWorkAreaChanged();
 }
 
 void DesktopWindowTreeHostWin::HandleVisibilityChanging(bool visible) {
   native_widget_delegate_->OnNativeWidgetVisibilityChanging(visible);
 }
 
@@ skipping 186 matching lines @@
 
 // static
 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura) {
   return new DesktopWindowTreeHostWin(native_widget_delegate,
                                       desktop_native_widget_aura);
 }
 
 }  // namespace views