Rename bounds accessors to be intuitive and consistent

content/browser/web_contents/web_contents_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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
@@ skipping 286 matching lines @@
 
 gfx::NativeView WebContentsViewAura::GetContentNativeView() const {
   return view_->GetNativeView();
 }
 
 gfx::NativeWindow WebContentsViewAura::GetTopLevelNativeWindow() const {
   return window_->GetToplevelWindow();
 }
 
 void WebContentsViewAura::GetContainerBounds(gfx::Rect *out) const {
-  *out = window_->GetScreenBounds();
+  *out = window_->GetBoundsInScreen();
 }
 
 void WebContentsViewAura::SetPageTitle(const string16& title) {
   window_->set_title(title);
 }
 
 void WebContentsViewAura::OnTabCrashed(base::TerminationStatus status,
                                        int error_code) {
   view_ = NULL;
   // Set the focus to the parent because neither the view window nor this
@@ skipping 73 matching lines @@
 }
 
 bool WebContentsViewAura::IsEventTracking() const {
   return false;
 }
 
 void WebContentsViewAura::CloseTabAfterEventTracking() {
 }
 
 gfx::Rect WebContentsViewAura::GetViewBounds() const {
-  return window_->GetRootWindowBounds();
+  return window_->GetBoundsInRootWindow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, RenderViewHostDelegateView implementation:
 
 void WebContentsViewAura::ShowContextMenu(
     const content::ContextMenuParams& params) {
   if (delegate_.get())
     delegate_->ShowContextMenu(params);
 }
@@ skipping 223 matching lines @@
     OnDragEntered(event);
 
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
       GetNativeView()->GetRootWindow()->last_mouse_location(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   return current_drag_op_;
 }