Rename bounds accessors to be intuitive and consistent

ash/wm/workspace/multi_window_resize_controller.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/wm/workspace/multi_window_resize_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
@@ skipping 409 matching lines @@
     bounds.set_x(show_bounds_.x());
   resize_widget_->SetBounds(bounds);
 }
 
 void MultiWindowResizeController::CompleteResize(int event_flags) {
   window_resizer_->CompleteDrag(event_flags);
   window_resizer_.reset();
 
   // Mouse may still be over resizer, if not hide.
   gfx::Point screen_loc = gfx::Screen::GetCursorScreenPoint();
-  if (!resize_widget_->GetWindowScreenBounds().Contains(screen_loc))
+  if (!resize_widget_->GetWindowBoundsInScreen().Contains(screen_loc))
     Hide();
 }
 
 void MultiWindowResizeController::CancelResize() {
   if (!window_resizer_.get())
     return;  // Happens if window was destroyed and we nuked the WindowResizer.
   window_resizer_->RevertDrag();
   window_resizer_.reset();
   Hide();
 }
@@ skipping 18 matching lines @@
     y = windows_.window1->bounds().bottom() - pref.height() / 2;
   }
   return gfx::Rect(x, y, pref.width(), pref.height());
 }
 
 bool MultiWindowResizeController::IsOverWindows(
     const gfx::Point& screen_location) const {
   if (window_resizer_.get())
     return true;  // Ignore hides while actively resizing.
 
-  if (resize_widget_->GetWindowScreenBounds().Contains(screen_location))
+  if (resize_widget_->GetWindowBoundsInScreen().Contains(screen_location))
     return true;
 
   int hit1, hit2;
   if (windows_.direction == TOP_BOTTOM) {
     hit1 = HTBOTTOM;
     hit2 = HTTOP;
   } else {
     hit1 = HTRIGHT;
     hit2 = HTLEFT;
   }
@@ skipping 11 matching lines @@
 
   gfx::Point window_loc(screen_location);
   aura::Window::ConvertPointToWindow(
       window->GetRootWindow(), window, &window_loc);
   return window->HitTest(window_loc) &&
       window->delegate()->GetNonClientComponent(window_loc) == component;
 }
 
 }  // namespace internal
 }  // namespace ash