Rename bounds accessors to be intuitive and consistent

ash/wm/panel_layout_manager_unittest.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 "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 62 matching lines @@
   // TODO(dcheng): This should be const, but GetScreenBoundsOfItemIconForWindow
   // takes a non-const Window. We can probably fix that.
   void IsPanelAboveLauncherIcon(aura::Window* panel) {
     // Waits until all launcher view animations are done.
     launcher_view_test()->RunMessageLoopUntilAnimationsDone();
 
     Launcher* launcher = Shell::GetInstance()->launcher();
     gfx::Rect icon_bounds = launcher->GetScreenBoundsOfItemIconForWindow(panel);
     ASSERT_FALSE(icon_bounds.IsEmpty());
 
-    gfx::Rect window_bounds = panel->GetRootWindowBounds();
+    gfx::Rect window_bounds = panel->GetBoundsInRootWindow();
 
     // 1-pixel tolerance--since we center panels over their icons, panels with
     // odd pixel widths won't be perfectly lined up with even pixel width
     // launcher icons.
     EXPECT_NEAR(icon_bounds.CenterPoint().x(),
                 window_bounds.CenterPoint().x(),
                 1);
-    EXPECT_EQ(launcher->widget()->GetWindowScreenBounds().y(),
+    EXPECT_EQ(launcher->widget()->GetWindowBoundsInScreen().y(),
               window_bounds.bottom());
   }
 
   void IsCalloutAbovePanel(aura::Window* panel) {
     // Flush the message loop, since callout updates use a delayed task.
     MessageLoop::current()->RunAllPending();
     views::Widget* widget = NULL;
     GetCalloutWidget(&widget);
     EXPECT_TRUE(widget->IsVisible());
-    EXPECT_EQ(panel->GetRootWindowBounds().bottom(),
-              widget->GetWindowScreenBounds().y());
-    EXPECT_NEAR(panel->GetRootWindowBounds().CenterPoint().x(),
-                widget->GetWindowScreenBounds().CenterPoint().x(),
+    EXPECT_EQ(panel->GetBoundsInRootWindow().bottom(),
+              widget->GetWindowBoundsInScreen().y());
+    EXPECT_NEAR(panel->GetBoundsInRootWindow().CenterPoint().x(),
+                widget->GetWindowBoundsInScreen().CenterPoint().x(),
                 1);
   }
 
   bool IsCalloutVisible() {
     views::Widget* widget = NULL;
     GetCalloutWidget(&widget);
     return widget->IsVisible();
   }
 
   test::LauncherViewTestAPI* launcher_view_test() {
@@ skipping 138 matching lines @@
   wm::ActivateWindow(w2.get());
   // Windows should be stacked 1 < 2 > 3
   w1.reset();
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get()));
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w3.get()));
   EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get()));
 }
 
 }  // namespace internal
 }  // namespace ash