Rename the remaining usage of Monitor to Display

ui/aura/env.h

Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index e8e787d85f9eed63908d29a4dbde3291cfa14f48..bef9483fe4deb905e2627d299b1edf82e8093db0 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -17,11 +17,11 @@ namespace aura {
 class CursorManager;
 class EnvObserver;
 class EventFilter;
-class MonitorManager;
+class DisplayManager;
 class Window;
 
 namespace internal {
-class MonitorChangeObserverX11;
+class DisplayChangeObserverX11;
 }
 
 #if !defined(OS_MACOSX)
@@ -56,10 +56,10 @@ class AURA_EXPORT Env {
     stacking_client_ = stacking_client;
   }
 
-  // Gets/sets MonitorManager. The MonitorManager's ownership is
+  // Gets/sets DisplayManager. The DisplayManager's ownership is
   // transfered.
-  MonitorManager* monitor_manager() { return monitor_manager_.get(); }
-  void SetMonitorManager(MonitorManager* monitor_manager);
+  DisplayManager* display_manager() { return display_manager_.get(); }
+  void SetDisplayManager(DisplayManager* display_manager);
 
   // Env takes ownership of the EventFilter.
   EventFilter* event_filter() { return event_filter_.get(); }
@@ -92,12 +92,12 @@ class AURA_EXPORT Env {
   int mouse_button_flags_;
   bool is_touch_down_;
   client::StackingClient* stacking_client_;
-  scoped_ptr<MonitorManager> monitor_manager_;
+  scoped_ptr<DisplayManager> display_manager_;
   scoped_ptr<EventFilter> event_filter_;
   CursorManager cursor_manager_;
 
 #if defined(USE_X11)
-  scoped_ptr<internal::MonitorChangeObserverX11> monitor_change_observer_;
+  scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Env);