Rename bounds accessors to be intuitive and consistent

ash/wm/workspace/snap_sizer.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/snap_sizer.h"
 
 #include <cmath>
 
 #include "ash/screen_ash.h"
 #include "ash/wm/window_resizer.h"
@@ skipping 92 matching lines @@
   }
   num_moves_since_adjust_ = 0;
   last_adjust_x_ = x;
 }
 
 gfx::Rect SnapSizer::GetTargetBounds() const {
   return GetTargetBoundsForPercent(percent_index_);
 }
 
 gfx::Rect SnapSizer::GetTargetBoundsForPercent(int percent_index) const {
-  gfx::Rect work_area(ScreenAsh::GetUnmaximizedWorkAreaParentBounds(window_));
+  gfx::Rect work_area(ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(window_));
   int y = WindowResizer::AlignToGridRoundUp(work_area.y(), grid_size_);
   // We don't align to the bottom of the grid as the launcher may not
   // necessarily align to the grid (happens when auto-hidden).
   int max_y = work_area.bottom();
   int width = static_cast<float>(work_area.width()) * kPercents[percent_index];
   if (edge_ == LEFT_EDGE) {
     int x = WindowResizer::AlignToGridRoundUp(work_area.x(), grid_size_);
     int mid_x = WindowResizer::AlignToGridRoundUp(
         work_area.x() + width, grid_size_);
     return gfx::Rect(x, y, mid_x - x, max_y - y);
   }
   int max_x =
       WindowResizer::AlignToGridRoundDown(work_area.right(), grid_size_);
   int x = WindowResizer::AlignToGridRoundUp(max_x - width, grid_size_);
   return gfx::Rect(x , y, max_x - x, max_y - y);
 }
 
 bool SnapSizer::AlongEdge(int x) const {
-  gfx::Rect area(ScreenAsh::GetDisplayParentBounds(window_));
+  gfx::Rect area(ScreenAsh::GetDisplayBoundsInParent(window_));
   return (x <= area.x()) || (x >= area.right() - 1);
 }
 
 }  // namespace internal
 }  // namespace ash