Rename bounds accessors to be intuitive and consistent

ash/screen_ash.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 "ash/screen_ash.h"
 
 #include "ash/shell.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 11 matching lines @@
 }
 }  // namespace
 
 ScreenAsh::ScreenAsh() {
 }
 
 ScreenAsh::~ScreenAsh() {
 }
 
 // static
-gfx::Rect ScreenAsh::GetMaximizedWindowParentBounds(aura::Window* window) {
+gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
   if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
     return Shell::GetInstance()->shelf()->GetMaximizedWindowBounds(window);
   else
-    return GetDisplayParentBounds(window);
+    return GetDisplayBoundsInParent(window);
 }
 
 // static
-gfx::Rect ScreenAsh::GetUnmaximizedWorkAreaParentBounds(aura::Window* window) {
+gfx::Rect ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
+    aura::Window* window) {
   if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
     return Shell::GetInstance()->shelf()->GetUnmaximizedWorkAreaBounds(window);
   else
-    return GetDisplayWorkAreaParentBounds(window);
+    return GetDisplayWorkAreaBoundsInParent(window);
 }
 
 // static
-gfx::Rect ScreenAsh::GetDisplayParentBounds(aura::Window* window) {
+gfx::Rect ScreenAsh::GetDisplayBoundsInParent(aura::Window* window) {
   return ConvertRectFromScreen(
       window->parent(),
       gfx::Screen::GetDisplayNearestWindow(window).bounds());
 }
 
 // static
-gfx::Rect ScreenAsh::GetDisplayWorkAreaParentBounds(aura::Window* window) {
+gfx::Rect ScreenAsh::GetDisplayWorkAreaBoundsInParent(aura::Window* window) {
   return ConvertRectFromScreen(
       window->parent(),
       gfx::Screen::GetDisplayNearestWindow(window).work_area());
 }
 
 // static
 gfx::Rect ScreenAsh::ConvertRectToScreen(aura::Window* window,
                                          const gfx::Rect& rect) {
   gfx::Point point = rect.origin();
   aura::client::GetScreenPositionClient(window->GetRootWindow())->
@@ skipping 34 matching lines @@
 
 gfx::Display ScreenAsh::GetDisplayMatching(const gfx::Rect& match_rect) const {
   return GetDisplayManager()->GetDisplayMatching(match_rect);
 }
 
 gfx::Display ScreenAsh::GetPrimaryDisplay() const {
   return *GetDisplayManager()->GetDisplayAt(0);
 }
 
 }  // namespace ash