Rename bounds accessors to be intuitive and consistent

chrome/browser/ui/views/hung_renderer_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/browser_dialogs.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include <windows.h>
 #endif
 
@@ skipping 530 matching lines @@
   column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_set_id);
   layout->AddView(kill_button_);
 }
 
 gfx::Rect HungRendererDialogView::GetDisplayBounds(
     WebContents* contents) {
 #if defined(USE_AURA)
-  gfx::Rect contents_bounds(contents->GetNativeView()->GetRootWindowBounds());
+  gfx::Rect contents_bounds(contents->GetNativeView()->GetBoundsInRootWindow());
 #elif defined(OS_WIN)
   HWND contents_hwnd = contents->GetNativeView();
   RECT contents_bounds_rect;
   GetWindowRect(contents_hwnd, &contents_bounds_rect);
   gfx::Rect contents_bounds(contents_bounds_rect);
 #endif
-  gfx::Rect window_bounds = GetWidget()->GetWindowScreenBounds();
+  gfx::Rect window_bounds = GetWidget()->GetWindowBoundsInScreen();
 
   int window_x = contents_bounds.x() +
       (contents_bounds.width() - window_bounds.width()) / 2;
   int window_y = contents_bounds.y() + kOverlayContentsOffsetY;
   return gfx::Rect(window_x, window_y, window_bounds.width(),
                    window_bounds.height());
 }
 
 // static
 void HungRendererDialogView::InitClass() {
@@ skipping 20 matching lines @@
     g_instance->ShowForWebContents(contents);
   }
 }
 
 void HideHungRendererDialog(WebContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForWebContents(contents);
 }
 
 }  // namespace chrome