Rename the remaining usage of Monitor to Display

ui/aura/env.cc

Index: ui/aura/env.cc
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 18aac53ffbe234645dc1363935039c96ebe78829..d65a318ca5da332f11836f9e36f025d8a5e2c744 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -7,13 +7,13 @@
 #include "ui/aura/cursor_manager.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/event_filter.h"
-#include "ui/aura/monitor_manager.h"
+#include "ui/aura/display_manager.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/compositor.h"
 
 #if defined(USE_X11)
-#include "ui/aura/monitor_change_observer_x11.h"
+#include "ui/aura/display_change_observer_x11.h"
 #endif
 
 namespace aura {
@@ -57,11 +57,11 @@ void Env::RemoveObserver(EnvObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void Env::SetMonitorManager(MonitorManager* monitor_manager) {
-  monitor_manager_.reset(monitor_manager);
+void Env::SetDisplayManager(DisplayManager* display_manager) {
+  display_manager_.reset(display_manager);
 #if defined(USE_X11)
-  // Update the monitor manager with latest info.
-  monitor_change_observer_->NotifyDisplayChange();
+  // Update the display manager with latest info.
+  display_change_observer_->NotifyDisplayChange();
 #endif
 }
 
@@ -83,7 +83,7 @@ void Env::Init() {
   dispatcher_.reset(CreateDispatcher());
 #endif
 #if defined(USE_X11)
-  monitor_change_observer_.reset(new internal::MonitorChangeObserverX11);
+  display_change_observer_.reset(new internal::DisplayChangeObserverX11);
 #endif
   ui::Compositor::Initialize(false);
 }