Rename bounds accessors to be intuitive and consistent

chrome/browser/ui/panels/panel_view.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 "chrome/browser/ui/panels/panel_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
 #include "chrome/browser/ui/panels/panel_frame_view.h"
@@ skipping 173 matching lines @@
   bounds_ = new_bounds;
 
   if (!animate) {
     // If no animation is in progress, apply bounds change instantly. Otherwise,
     // continue the animation with new target bounds.
     if (!IsAnimatingBounds())
       GetWidget()->SetBounds(bounds_);
     return;
   }
 
-  animation_start_bounds_ = window_->GetWindowScreenBounds();
+  animation_start_bounds_ = window_->GetWindowBoundsInScreen();
 
   bounds_animator_.reset(new PanelBoundsAnimation(
       this, panel_.get(), animation_start_bounds_, new_bounds));
   bounds_animator_->Start();
 }
 
 void PanelView::AnimationEnded(const ui::Animation* animation) {
   panel_->manager()->OnPanelAnimationEnded(panel_.get());
 }
 
@@ skipping 248 matching lines @@
 }
 
 void PanelView::OnWindowBeginUserBoundsChange() {
   panel_->OnPanelStartUserResizing();
 }
 
 void PanelView::OnWindowEndUserBoundsChange() {
   panel_->OnPanelEndUserResizing();
 
   // No need to proceed with post-resizing update when there is no size change.
-  gfx::Rect new_bounds = window_->GetWindowScreenBounds();
+  gfx::Rect new_bounds = window_->GetWindowBoundsInScreen();
   if (bounds_ == new_bounds)
     return;
   bounds_ = new_bounds;
 
   panel_->IncreaseMaxSize(bounds_.size());
   panel_->set_full_size(bounds_.size());
 
   panel_->panel_strip()->RefreshLayout();
 }
 
@@ skipping 161 matching lines @@
 
 PanelFrameView* PanelView::GetFrameView() const {
   return static_cast<PanelFrameView*>(window_->non_client_view()->frame_view());
 }
 
 bool PanelView::IsAnimatingBounds() const {
   return bounds_animator_.get() && bounds_animator_->is_animating();
 }
 
 bool PanelView::IsWithinResizingArea(const gfx::Point& mouse_location) const {
-  gfx::Rect bounds = window_->GetWindowScreenBounds();
+  gfx::Rect bounds = window_->GetWindowBoundsInScreen();
   DCHECK(bounds.Contains(mouse_location));
   return mouse_location.x() < bounds.x() + kResizeInsideBoundsSize ||
          mouse_location.x() >= bounds.right() - kResizeInsideBoundsSize ||
          mouse_location.y() < bounds.y() + kResizeInsideBoundsSize ||
          mouse_location.y() >= bounds.bottom() - kResizeInsideBoundsSize;
 }
 
 #if defined(OS_WIN) && !defined(USE_ASH) && !defined(USE_AURA)
 void PanelView::UpdateWindowAttribute(int attribute_index,
                                       int attribute_value,
@@ skipping 21 matching lines @@
   int height = web_view_->size().height();
   SkRegion* region = new SkRegion;
   region->op(0, 0, kResizeInsideBoundsSize, height, SkRegion::kUnion_Op);
   region->op(width - kResizeInsideBoundsSize, 0, width, height,
       SkRegion::kUnion_Op);
   region->op(0, height - kResizeInsideBoundsSize, width, height,
       SkRegion::kUnion_Op);
   web_contents->GetRenderViewHost()->GetView()->SetClickthroughRegion(region);
 #endif
 }