Rename the remaining usage of Monitor to Display

ash/wm/base_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/base_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/shelf_layout_manager.h"
@@ skipping 102 matching lines @@
 // BaseLayoutManager, RootWindowObserver overrides:
 
 void BaseLayoutManager::OnRootWindowResized(const aura::RootWindow* root,
                                             const gfx::Size& old_size) {
   AdjustWindowSizesForScreenChange();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, ash::ShellObserver overrides:
 
-void BaseLayoutManager::OnMonitorWorkAreaInsetsChanged() {
+void BaseLayoutManager::OnDisplayWorkAreaInsetsChanged() {
   AdjustWindowSizesForScreenChange();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, WindowObserver overrides:
 
 void BaseLayoutManager::OnWindowPropertyChanged(aura::Window* window,
                                                 const void* key,
                                                 intptr_t old) {
   if (key == aura::client::kShowStateKey) {
@@ skipping 81 matching lines @@
       !window->GetProperty(aura::client::kAnimationsDisabledKey) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           ash::switches::kAshWindowAnimationsDisabled)) {
     CrossFadeToBounds(window, new_bounds);
     return;
   }
   SetChildBoundsDirect(window, new_bounds);
 }
 
 void BaseLayoutManager::AdjustWindowSizesForScreenChange() {
-  // If a user plugs an external monitor into a laptop running Aura the
-  // monitor size will change.  Maximized windows need to resize to match.
+  // If a user plugs an external display into a laptop running Aura the
+  // display size will change.  Maximized windows need to resize to match.
   // We also do this when developers running Aura on a desktop manually resize
   // the host window.
   // We also need to do this when the work area insets changes.
   for (WindowSet::const_iterator it = windows_.begin();
        it != windows_.end();
        ++it) {
     aura::Window* window = *it;
     if (wm::IsWindowMaximized(window)) {
       SetChildBoundsDirect(window, ScreenAsh::GetMaximizedWindowBounds(window));
     } else if (wm::IsWindowFullscreen(window)) {
       SetChildBoundsDirect(
           window, gfx::Screen::GetDisplayNearestWindow(window).bounds());
     } else {
       // The work area may be smaller than the full screen.
-      gfx::Rect monitor_rect =
+      gfx::Rect display_rect =
           gfx::Screen::GetDisplayNearestWindow(window).work_area();
-      // Put as much of the window as possible within the monitor area.
-      window->SetBounds(window->bounds().AdjustToFit(monitor_rect));
+      // Put as much of the window as possible within the display area.
+      window->SetBounds(window->bounds().AdjustToFit(display_rect));
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash