Rename bounds accessors to be intuitive and consistent

ash/wm/window_resizer.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/window_resizer.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
@@ skipping 186 matching lines @@
   gfx::Size size = GetSizeForDrag(details, &delta_x, &delta_y, grid_size);
   gfx::Point origin = GetOriginForDrag(details, delta_x, delta_y);
 
   gfx::Rect new_bounds(origin, size);
   // Update bottom edge to stay in the work area when we are resizing
   // by dragging the bottome edge or corners.
   if (details.window_component == HTBOTTOM ||
       details.window_component == HTBOTTOMRIGHT ||
       details.window_component == HTBOTTOMLEFT) {
     gfx::Rect work_area =
-        ScreenAsh::GetDisplayWorkAreaParentBounds(details.window);
+        ScreenAsh::GetDisplayWorkAreaBoundsInParent(details.window);
     if (new_bounds.bottom() > work_area.bottom())
       new_bounds.Inset(0, 0, 0,
                        new_bounds.bottom() - work_area.bottom());
   }
   if (details.bounds_change & kBoundsChange_Resizes &&
       details.bounds_change & kBoundsChange_Repositions && new_bounds.y() < 0) {
     int delta = new_bounds.y();
     new_bounds.set_y(0);
     new_bounds.set_height(new_bounds.height() + delta);
   }
@@ skipping 114 matching lines @@
         gfx::Screen::GetDisplayNearestWindow(details.window).bounds().height();
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (details.initial_bounds.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura