Rename the remaining usage of Monitor to Display

ui/aura/env.cc

 // 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.
 
 #include "ui/aura/env.h"
 
 #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 {
 
 // static
 Env* Env::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, public:
 
@@ skipping 23 matching lines @@
 }
 
 void Env::AddObserver(EnvObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 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
 }
 
 void Env::SetEventFilter(EventFilter* event_filter) {
   event_filter_.reset(event_filter);
 }
 
 #if !defined(OS_MACOSX)
 MessageLoop::Dispatcher* Env::GetDispatcher() {
   return dispatcher_.get();
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
 void Env::Init() {
 #if !defined(OS_MACOSX)
   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);
 }
 
 void Env::NotifyWindowInitialized(Window* window) {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window));
 }
 
 }  // namespace aura