Rename bounds accessors to be intuitive and consistent

GetClientAreaScreenBounds -> GetClientAreaBoundsInScreen
Get/Set ParentBounds -> Get/Set BoundsInParent
GetWorkAreaScreenBounds -> GetWorkAreaBoundsInScreen
GetClientAreaScreenBounds -> GetClientAreaBoundsInScreen
GetWindowScreenBounds -> GetWindowBoundsInScreen
GetScreenBounds -> GetBoundsInScreen
GetRootWindowBounds -> GetBoundsInRootWindow

BUG=none
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10795013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147499 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 6 deletions

diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc
index a7adb30..6c39ced 100644
--- a/ash/screen_ash.cc
+++ b/ash/screen_ash.cc
@@ -29,30 +29,31 @@ 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());