Rename the remaining usage of Monitor to Display

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 65 matching lines @@
 
 namespace internal {
 class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class CaptureController;
 class DragDropController;
 class FocusCycler;
 class KeyRewriterEventFilter;
 class MagnificationController;
-class MonitorController;
+class DisplayController;
 class MouseCursorEventFilter;
 class PanelLayoutManager;
 class PartialScreenshotEventFilter;
 class ResizeShadowController;
 class RootWindowController;
 class RootWindowLayoutManager;
 class ShadowController;
 class ShelfLayoutManager;
 class ShellContextMenu;
 class SlowAnimationEventFilter;
@@ skipping 115 matching lines @@
   bool IsModalWindowOpen() const;
 
   // Creates a default views::NonClientFrameView for use by windows in the
   // Ash environment.
   views::NonClientFrameView* CreateDefaultNonClientFrameView(
       views::Widget* widget);
 
   // Rotates focus through containers that can receive focus.
   void RotateFocus(Direction direction);
 
-  // Sets the work area insets of the monitor that contains |window|,
+  // Sets the work area insets of the display that contains |window|,
   // this notifies observers too.
   // TODO(sky): this no longer really replicates what happens and is unreliable.
   // Remove this.
-  void SetMonitorWorkAreaInsets(aura::Window* window,
+  void SetDisplayWorkAreaInsets(aura::Window* window,
                                 const gfx::Insets& insets);
 
   // Called when the user logs in.
   void OnLoginStateChanged(user::LoginStatus status);
 
   // Called when the application is exiting.
   void OnAppTerminating();
 
   // Called when the screen is locked (after the lock window is visible) or
   // unlocked.
@@ skipping 35 matching lines @@
   }
   VideoDetector* video_detector() {
     return video_detector_.get();
   }
   WindowCycleController* window_cycle_controller() {
     return window_cycle_controller_.get();
   }
   internal::FocusCycler* focus_cycler() {
     return focus_cycler_.get();
   }
-  internal::MonitorController* monitor_controller() {
-    return monitor_controller_.get();
+  internal::DisplayController* display_controller() {
+    return display_controller_.get();
   }
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
   UserWallpaperDelegate* user_wallpaper_delegate() {
     return user_wallpaper_delegate_.get();
   }
 
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
@@ skipping 45 matching lines @@
   // Made available for tests.
   internal::ShadowController* shadow_controller() {
     return shadow_controller_.get();
   }
 
   content::BrowserContext* browser_context() { return browser_context_; }
   void set_browser_context(content::BrowserContext* browser_context) {
     browser_context_ = browser_context;
   }
 
-  // Initializes the root window to be used for a secondary monitor.
-  void InitRootWindowForSecondaryMonitor(aura::RootWindow* root);
+  // Initializes the root window to be used for a secondary display.
+  void InitRootWindowForSecondaryDisplay(aura::RootWindow* root);
 
 #if defined(OS_CHROMEOS)
   chromeos::OutputConfigurator* output_configurator() {
     return output_configurator_.get();
   }
 #endif  // defined(OS_CHROMEOS)
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
@@ skipping 61 matching lines @@
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
   scoped_ptr<internal::TooltipController> tooltip_controller_;
   scoped_ptr<internal::VisibilityController> visibility_controller_;
   scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
   scoped_ptr<PowerButtonController> power_button_controller_;
   scoped_ptr<UserActivityDetector> user_activity_detector_;
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<internal::FocusCycler> focus_cycler_;
-  scoped_ptr<internal::MonitorController> monitor_controller_;
+  scoped_ptr<internal::DisplayController> display_controller_;
   scoped_ptr<HighContrastController> high_contrast_controller_;
   scoped_ptr<internal::MagnificationController> magnification_controller_;
   scoped_ptr<aura::FocusManager> focus_manager_;
   scoped_ptr<aura::client::UserActionClient> user_action_client_;
   scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
 
   // An event filter that rewrites or drops a key event.
   scoped_ptr<internal::KeyRewriterEventFilter> key_rewriter_filter_;
 
   // An event filter that pre-handles key events while the partial
@@ skipping 39 matching lines @@
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_