Rename bounds accessors to be intuitive and consistent

chrome/browser/ui/views/frame/app_non_client_frame_view_aura.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/views/frame/app_non_client_frame_view_aura.h"
 
 #include "base/debug/stack_trace.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"  // Accessibility names
@@ skipping 147 matching lines @@
 };
 
 class AppNonClientFrameViewAura::Host : public views::MouseWatcherHost {
  public:
   explicit Host(AppNonClientFrameViewAura* owner) : owner_(owner) {}
   virtual ~Host() {}
 
   virtual bool Contains(
       const gfx::Point& screen_point,
       views::MouseWatcherHost::MouseEventType type) OVERRIDE {
-    gfx::Rect top_margin = owner_->GetScreenBounds();
+    gfx::Rect top_margin = owner_->GetBoundsInScreen();
     top_margin.set_height(kTopMargin);
     gfx::Rect control_bounds = owner_->GetControlBounds();
     control_bounds.Inset(kShadowStart, 0, 0, kShadowStart);
     return top_margin.Contains(screen_point) ||
         control_bounds.Contains(screen_point);
   }
 
  private:
   AppNonClientFrameViewAura* owner_;
 
@@ skipping 145 matching lines @@
 bool AppNonClientFrameViewAura::IsShowingControls() const {
   return control_widget_ && control_widget_->IsVisible();
 }
 
 void AppNonClientFrameViewAura::Restore() {
   if (control_widget_)
     control_widget_->Close();
   mouse_watcher_.Stop();
   frame()->Restore();
 }