Rename bounds accessors to be intuitive and consistent

ash/wm/workspace/frame_maximize_button.cc

Index: ash/wm/workspace/frame_maximize_button.cc
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc
index 2504e2b42279699a85b96b7313dded5e279397d7..c57a385d16e384d9a92e16962c79f6413163c960 100644
--- a/ash/wm/workspace/frame_maximize_button.cc
+++ b/ash/wm/workspace/frame_maximize_button.cc
@@ -362,7 +362,7 @@ gfx::Rect FrameMaximizeButton::ScreenBoundsForType(SnapType type) const {
     case SNAP_MAXIMIZE:
       return ScreenAsh::ConvertRectToScreen(
           window->parent(),
-          ScreenAsh::GetMaximizedWindowParentBounds(window));
+          ScreenAsh::GetMaximizedWindowBoundsInParent(window));
     case SNAP_MINIMIZE: {
       Launcher* launcher = Shell::GetInstance()->launcher();
       gfx::Rect item_rect(launcher->GetScreenBoundsOfItemIconForWindow(window));
@@ -372,11 +372,12 @@ gfx::Rect FrameMaximizeButton::ScreenBoundsForType(SnapType type) const {
         item_rect.Inset(-8, -8);
         return item_rect;
       }
-      return launcher->widget()->GetWindowScreenBounds();
+      return launcher->widget()->GetWindowBoundsInScreen();
     }
     case SNAP_RESTORE: {
       const gfx::Rect* restore = GetRestoreBoundsInScreen(window);
-      return restore ? *restore : frame_->GetWidget()->GetWindowScreenBounds();
+      return restore ?
+          *restore : frame_->GetWidget()->GetWindowBoundsInScreen();
     }
     case SNAP_NONE:
       NOTREACHED();