Rename bounds accessors to be intuitive and consistent

ash/wm/panel_layout_manager.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/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 
 #include "ash/launcher/launcher.h"
@@ skipping 232 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager private implementation:
 void PanelLayoutManager::Relayout() {
   if (!launcher_ || !launcher_->widget())
     return;
 
   if (in_layout_)
     return;
   AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
 
-  int launcher_top = launcher_->widget()->GetWindowScreenBounds().y();
+  int launcher_top = launcher_->widget()->GetWindowBoundsInScreen().y();
   aura::Window* active_panel = NULL;
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     aura::Window* panel = *iter;
     if (!panel->IsVisible() || panel == dragged_panel_)
       continue;
 
     gfx::Rect icon_bounds =
         launcher_->GetScreenBoundsOfItemIconForWindow(panel);
 
@@ skipping 82 matching lines @@
   }
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&PanelLayoutManager::ShowCalloutHelper,
                  weak_factory_.GetWeakPtr(),
                  active_panel));
 }
 
 void PanelLayoutManager::ShowCalloutHelper(aura::Window* active_panel) {
   DCHECK(active_panel);
-  gfx::Rect bounds = active_panel->GetRootWindowBounds();
-  gfx::Rect callout_bounds = callout_widget_->GetWindowScreenBounds();
+  gfx::Rect bounds = active_panel->GetBoundsInRootWindow();
+  gfx::Rect callout_bounds = callout_widget_->GetWindowBoundsInScreen();
   callout_bounds.set_x(
       bounds.x() + (bounds.width() - callout_bounds.width()) / 2);
   callout_bounds.set_y(bounds.bottom());
   SetChildBoundsDirect(callout_widget_->GetNativeWindow(), callout_bounds);
   panel_container_->StackChildAtTop(callout_widget_->GetNativeWindow());
   callout_widget_->Show();
 }
 
 }  // namespace internal
 }  // namespace ash