Rename the remaining usage of Monitor to Display

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"
@@ skipping 11 matching lines @@
 
 namespace {
 
 class BaseLayoutManagerTest : public test::AshTestBase {
  public:
   BaseLayoutManagerTest() {}
   virtual ~BaseLayoutManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
-    Shell::GetInstance()->SetMonitorWorkAreaInsets(
+    Shell::GetInstance()->SetDisplayWorkAreaInsets(
         Shell::GetPrimaryRootWindow(),
         gfx::Insets(1, 2, 3, 4));
     Shell::GetPrimaryRootWindow()->SetHostSize(gfx::Size(800, 600));
     aura::Window* default_container = Shell::GetContainer(
         Shell::GetPrimaryRootWindow(),
         internal::kShellWindowId_DefaultContainer);
     default_container->SetLayoutManager(new internal::BaseLayoutManager(
         Shell::GetPrimaryRootWindow()));
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     return aura::test::CreateTestWindowWithBounds(bounds, NULL);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BaseLayoutManagerTest);
 };
 
 // Tests normal->maximize->normal.
 TEST_F(BaseLayoutManagerTest, Maximize) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
-  // Maximized window fills the work area, not the whole monitor.
+  // Maximized window fills the work area, not the whole display.
   EXPECT_EQ(ScreenAsh::GetMaximizedWindowBounds(window.get()).ToString(),
             window->bounds().ToString());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(bounds.ToString(), window->bounds().ToString());
 }
 
 // Tests normal->minimize->normal.
 TEST_F(BaseLayoutManagerTest, Minimize) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
@@ skipping 19 matching lines @@
             window->bounds().ToString());
   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.
+  // Fullscreen window fills the whole display.
   EXPECT_EQ(
       gfx::Screen::GetDisplayNearestWindow(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.
+  // Fullscreen window fills the whole display.
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_EQ(
       gfx::Screen::GetDisplayNearestWindow(window.get()).bounds().ToString(),
       window->bounds().ToString());
-  // Enlarge the root window.  We should still match the monitor size.
+  // Enlarge the root window.  We should still match the display size.
   Shell::GetPrimaryRootWindow()->SetHostSize(gfx::Size(800, 600));
   EXPECT_EQ(
       gfx::Screen::GetDisplayNearestWindow(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
@@ skipping 43 matching lines @@
   // 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