Rename bounds accessors to be intuitive and consistent

ash/wm/system_gesture_event_filter.cc

Index: ash/wm/system_gesture_event_filter.cc
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
index 91fa4cd265f62bd471210632988bc2034d6b4602..b64a78947f6442a11444b9b289a5c6bfa4b69bd6 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -439,7 +439,7 @@ class SystemPinchHandler {
       phantom_state_ = PHANTOM_WINDOW_MAXIMIZED;
       return ScreenAsh::ConvertRectToScreen(
           target_->parent(),
-          ScreenAsh::GetMaximizedWindowParentBounds(target_));
+          ScreenAsh::GetMaximizedWindowBoundsInParent(target_));
     }
 
     if (pinch_factor_ < kPinchThresholdForMinimize) {
@@ -455,7 +455,7 @@ class SystemPinchHandler {
       Launcher* launcher = Shell::GetInstance()->launcher();
       gfx::Rect rect = launcher->GetScreenBoundsOfItemIconForWindow(target_);
       if (rect.IsEmpty())
-        rect = launcher->widget()->GetWindowScreenBounds();
+        rect = launcher->widget()->GetWindowBoundsInScreen();
       else
         rect.Inset(-8, -8);
       phantom_state_ = PHANTOM_WINDOW_MINIMIZED;