Rename bounds accessors to be intuitive and consistent

ash/wm/custom_frame_view_ash_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/custom_frame_view_ash.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
@@ skipping 94 matching lines @@
 };
 
 // Tests that clicking on the resize-button toggles between maximize and normal
 // state.
 TEST_F(CustomFrameViewAshTest, ResizeButtonToggleMaximize) {
   views::Widget* widget = CreateWidget();
   aura::Window* window = widget->GetNativeWindow();
   CustomFrameViewAsh* frame = custom_frame_view_ash(widget);
   CustomFrameViewAsh::TestApi test(frame);
   views::View* view = test.maximize_button();
-  gfx::Point center = view->GetScreenBounds().CenterPoint();
+  gfx::Point center = view->GetBoundsInScreen().CenterPoint();
 
   aura::test::EventGenerator generator(window->GetRootWindow(), center);
 
   EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
 
   generator.ClickLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
 
-  center = view->GetScreenBounds().CenterPoint();
+  center = view->GetBoundsInScreen().CenterPoint();
   generator.MoveMouseTo(center);
   generator.ClickLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
 
-  generator.GestureTapAt(view->GetScreenBounds().CenterPoint());
+  generator.GestureTapAt(view->GetBoundsInScreen().CenterPoint());
   EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
 
-  generator.GestureTapAt(view->GetScreenBounds().CenterPoint());
+  generator.GestureTapAt(view->GetBoundsInScreen().CenterPoint());
   EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
 
-  generator.GestureTapDownAndUp(view->GetScreenBounds().CenterPoint());
+  generator.GestureTapDownAndUp(view->GetBoundsInScreen().CenterPoint());
   EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
 
-  generator.GestureTapDownAndUp(view->GetScreenBounds().CenterPoint());
+  generator.GestureTapDownAndUp(view->GetBoundsInScreen().CenterPoint());
   EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
 
   widget->Close();
 }
 
 // Tests that click+dragging on the resize-button tiles or minimizes the window.
 TEST_F(CustomFrameViewAshTest, ResizeButtonDrag) {
   views::Widget* widget = CreateWidget();
   aura::Window* window = widget->GetNativeWindow();
   CustomFrameViewAsh* frame = custom_frame_view_ash(widget);
   CustomFrameViewAsh::TestApi test(frame);
   views::View* view = test.maximize_button();
-  gfx::Point center = view->GetScreenBounds().CenterPoint();
+  gfx::Point center = view->GetBoundsInScreen().CenterPoint();
   const int kGridSize = ash::Shell::GetInstance()->GetGridSize();
 
   aura::test::EventGenerator generator(window->GetRootWindow(), center);
 
   EXPECT_TRUE(ash::wm::IsWindowNormal(window));
 
   // Snap right.
   {
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 0);
     generator.ReleaseLeftButton();
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     internal::SnapSizer sizer(window, center,
         internal::SnapSizer::RIGHT_EDGE, kGridSize);
     EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
   }
 
   // Snap left.
   {
-    center = view->GetScreenBounds().CenterPoint();
+    center = view->GetBoundsInScreen().CenterPoint();
     generator.MoveMouseTo(center);
     generator.PressLeftButton();
     generator.MoveMouseBy(-10, 0);
     generator.ReleaseLeftButton();
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     internal::SnapSizer sizer(window, center,
         internal::SnapSizer::LEFT_EDGE, kGridSize);
     EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
   }
 
   // Minimize.
   {
-    center = view->GetScreenBounds().CenterPoint();
+    center = view->GetBoundsInScreen().CenterPoint();
     generator.MoveMouseTo(center);
     generator.PressLeftButton();
     generator.MoveMouseBy(0, 10);
     generator.ReleaseLeftButton();
     RunAllPendingInMessageLoop();
 
     EXPECT_TRUE(ash::wm::IsWindowMinimized(window));
   }
 
   ash::wm::RestoreWindow(window);
 
   // Now test the same behaviour for gesture events.
 
   // Snap right.
   {
-    center = view->GetScreenBounds().CenterPoint();
+    center = view->GetBoundsInScreen().CenterPoint();
     gfx::Point end = center;
     end.Offset(40, 0);
     generator.GestureScrollSequence(center, end,
         base::TimeDelta::FromMilliseconds(100),
         3);
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     internal::SnapSizer sizer(window, center,
         internal::SnapSizer::RIGHT_EDGE, kGridSize);
     EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
   }
 
   // Snap left.
   {
-    center = view->GetScreenBounds().CenterPoint();
+    center = view->GetBoundsInScreen().CenterPoint();
     gfx::Point end = center;
     end.Offset(-40, 0);
     generator.GestureScrollSequence(center, end,
         base::TimeDelta::FromMilliseconds(100),
         3);
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     internal::SnapSizer sizer(window, center,
         internal::SnapSizer::LEFT_EDGE, kGridSize);
     EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
   }
 
   // Minimize.
   {
-    center = view->GetScreenBounds().CenterPoint();
+    center = view->GetBoundsInScreen().CenterPoint();
     gfx::Point end = center;
     end.Offset(0, 40);
     generator.GestureScrollSequence(center, end,
         base::TimeDelta::FromMilliseconds(100),
         3);
     RunAllPendingInMessageLoop();
 
     EXPECT_TRUE(ash::wm::IsWindowMinimized(window));
   }
 
   // Test with gesture events.
 
   widget->Close();
 }
 
 }  // namespace internal
 }  // namespace ash