Refactor screen/monitor so that gfx::Screen returns monitor object.

ash/wm/base_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/base_layout_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/screen.h"
 
 namespace ash {
 
 namespace {
 
 class BaseLayoutManagerTest : public test::AshTestBase {
  public:
   BaseLayoutManagerTest() {}
   virtual ~BaseLayoutManagerTest() {}
 
@@ skipping 56 matching lines @@
   EXPECT_NE(initial_work_area_bounds.ToString(),
             ScreenAsh::GetMaximizedWindowBounds(window.get()).ToString());
 }
 
 // Tests normal->fullscreen->normal.
 TEST_F(BaseLayoutManagerTest, Fullscreen) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   // Fullscreen window fills the whole monitor.
-  EXPECT_EQ(gfx::Screen::GetMonitorAreaNearestWindow(window.get()).ToString(),
-            window->bounds().ToString());
+  EXPECT_EQ(
+      gfx::Screen::GetMonitorNearestWindow(window.get()).bounds().ToString(),
+      window->bounds().ToString());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(bounds.ToString(), window->bounds().ToString());
 }
 
 // Tests fullscreen window size during root window resize.
 TEST_F(BaseLayoutManagerTest, FullscreenRootWindowResize) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
   // Fullscreen window fills the whole monitor.
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
-  EXPECT_EQ(gfx::Screen::GetMonitorAreaNearestWindow(window.get()).ToString(),
-            window->bounds().ToString());
+  EXPECT_EQ(
+      gfx::Screen::GetMonitorNearestWindow(window.get()).bounds().ToString(),
+      window->bounds().ToString());
   // Enlarge the root window.  We should still match the monitor size.
   Shell::GetRootWindow()->SetHostSize(gfx::Size(800, 600));
-  EXPECT_EQ(gfx::Screen::GetMonitorAreaNearestWindow(window.get()).ToString(),
-            window->bounds().ToString());
+  EXPECT_EQ(
+      gfx::Screen::GetMonitorNearestWindow(window.get()).bounds().ToString(),
+      window->bounds().ToString());
 }
 
 // Fails on Mac only.  Need to be implemented.  http://crbug.com/111279.
 #if defined(OS_MACOSX)
 #define MAYBE_RootWindowResizeShrinksWindows \
   FAILS_RootWindowResizeShrinksWindows
 #else
 #define MAYBE_RootWindowResizeShrinksWindows RootWindowResizeShrinksWindows
 #endif
 // Tests that when the screen gets smaller the windows aren't bigger than
 // the screen.
 TEST_F(BaseLayoutManagerTest, MAYBE_RootWindowResizeShrinksWindows) {
   scoped_ptr<aura::Window> window(
       CreateTestWindow(gfx::Rect(10, 20, 500, 400)));
-  gfx::Rect work_area = gfx::Screen::GetMonitorAreaNearestWindow(window.get());
+  gfx::Rect work_area =
+      gfx::Screen::GetMonitorNearestWindow(window.get()).work_area();
   // Invariant: Window is smaller than work area.
   EXPECT_LE(window->bounds().width(), work_area.width());
   EXPECT_LE(window->bounds().height(), work_area.height());
 
   // Make the root window narrower than our window.
   Shell::GetRootWindow()->SetHostSize(gfx::Size(300, 400));
-  work_area = gfx::Screen::GetMonitorAreaNearestWindow(window.get());
+  work_area = gfx::Screen::GetMonitorNearestWindow(window.get()).work_area();
   EXPECT_LE(window->bounds().width(), work_area.width());
   EXPECT_LE(window->bounds().height(), work_area.height());
 
   // Make the root window shorter than our window.
   Shell::GetRootWindow()->SetHostSize(gfx::Size(300, 200));
-  work_area = gfx::Screen::GetMonitorAreaNearestWindow(window.get());
+  work_area = gfx::Screen::GetMonitorNearestWindow(window.get()).work_area();
   EXPECT_LE(window->bounds().width(), work_area.width());
   EXPECT_LE(window->bounds().height(), work_area.height());
 
   // Enlarging the root window does not change the window bounds.
   gfx::Rect old_bounds = window->bounds();
   Shell::GetRootWindow()->SetHostSize(gfx::Size(800, 600));
   EXPECT_EQ(old_bounds.width(), window->bounds().width());
   EXPECT_EQ(old_bounds.height(), window->bounds().height());
 }
 
 // Tests that a maximized window with too-large restore bounds will be restored
 // to smaller than the full work area.
 TEST_F(BaseLayoutManagerTest, BoundsWithScreenEdgeVisible) {
   // Create a window with bounds that fill the screen.
-  gfx::Rect bounds = gfx::Screen::GetPrimaryMonitorBounds();
+  gfx::Rect bounds = gfx::Screen::GetPrimaryMonitor().bounds();
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
   // Maximize it, which writes the old bounds to restore bounds.
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   // Restore it.
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   // It should have the default maximized window bounds, inset by the grid size.
   int grid_size = ash::Shell::GetInstance()->GetGridSize();
   gfx::Rect max_bounds = ash::ScreenAsh::GetMaximizedWindowBounds(window.get());
   max_bounds.Inset(grid_size, grid_size);
   EXPECT_EQ(max_bounds.ToString(), window->bounds().ToString());
 }
 
 }  // namespace
 
 }  // namespace ash