Revert r 144499 "Rename the remaining usage of Monitor to Display"

Temporarily reverting rename change to investigate 133784

TBR=oshima@chromium.org
BUG=123160
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10689014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144573 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index d65a318..18aac53 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/display_manager.h"
+#include "ui/aura/monitor_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/display_change_observer_x11.h"
+#include "ui/aura/monitor_change_observer_x11.h"
 #endif
 
 namespace aura {
@@ -57,11 +57,11 @@ void Env::RemoveObserver(EnvObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void Env::SetDisplayManager(DisplayManager* display_manager) {
-  display_manager_.reset(display_manager);
+void Env::SetMonitorManager(MonitorManager* monitor_manager) {
+  monitor_manager_.reset(monitor_manager);
 #if defined(USE_X11)
-  // Update the display manager with latest info.
-  display_change_observer_->NotifyDisplayChange();
+  // Update the monitor manager with latest info.
+  monitor_change_observer_->NotifyDisplayChange();
 #endif
 }
 
@@ -83,7 +83,7 @@ void Env::Init() {
   dispatcher_.reset(CreateDispatcher());
 #endif
 #if defined(USE_X11)
-  display_change_observer_.reset(new internal::DisplayChangeObserverX11);
+  monitor_change_observer_.reset(new internal::MonitorChangeObserverX11);
 #endif
   ui::Compositor::Initialize(false);
 }