Rename the remaining usage of Monitor to Display

ash/display/display_controller.h

Index: ash/display/display_controller.h
diff --git a/ash/monitor/monitor_controller.h b/ash/display/display_controller.h
similarity index 85%
rename from ash/monitor/monitor_controller.h
rename to ash/display/display_controller.h
index 72afa4204a0c5b522d37161fb8f6952b6d381f10..1b66d0144be26e8c26aa497f5a106414f50acc8b 100644
--- a/ash/monitor/monitor_controller.h
+++ b/ash/display/display_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_MONITOR_MONITOR_CONTROLLER_H_
-#define ASH_MONITOR_MONITOR_CONTROLLER_H_
+#ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_
+#define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 #pragma once
 
 #include <map>
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/display_observer.h"
-#include "ui/aura/monitor_manager.h"
+#include "ui/aura/display_manager.h"
 
 namespace aura {
 class Display;
@@ -24,12 +24,12 @@ namespace ash {
 namespace internal {
 class RootWindowController;
 
-// MonitorController owns and maintains RootWindows for each attached
+// DisplayController owns and maintains RootWindows for each attached
 // display, keeping them in sync with display configuration changes.
-// TODO(oshima): Rename MonitorXXX to DisplayXXX.
-class ASH_EXPORT MonitorController : public aura::DisplayObserver {
+// TODO(oshima): Rename DisplayXXX to DisplayXXX.
+class ASH_EXPORT DisplayController : public aura::DisplayObserver {
  public:
-  // Layout options where the secondary monitor should be positioned.
+  // Layout options where the secondary display should be positioned.
   enum SecondaryDisplayLayout {
     TOP,
     RIGHT,
@@ -37,8 +37,8 @@ class ASH_EXPORT MonitorController : public aura::DisplayObserver {
     LEFT
   };
 
-  MonitorController();
-  virtual ~MonitorController();
+  DisplayController();
+  virtual ~DisplayController();
 
   // Initializes primary display.
   void InitPrimaryDisplay();
@@ -100,10 +100,10 @@ class ASH_EXPORT MonitorController : public aura::DisplayObserver {
 
   SecondaryDisplayLayout secondary_display_layout_;
 
-  DISALLOW_COPY_AND_ASSIGN(MonitorController);
+  DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_MONITOR_MONITOR_CONTROLLER_H_
+#endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_