Rename the remaining usage of Monitor to Display

ui/aura/env.h

 // 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.
 
 #ifndef UI_AURA_ENV_H_
 #define UI_AURA_ENV_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/cursor_manager.h"
 #include "ui/aura/client/stacking_client.h"
 
 namespace aura {
 class CursorManager;
 class EnvObserver;
 class EventFilter;
-class MonitorManager;
+class DisplayManager;
 class Window;
 
 namespace internal {
-class MonitorChangeObserverX11;
+class DisplayChangeObserverX11;
 }
 
 #if !defined(OS_MACOSX)
 // Creates a platform-specific native event dispatcher.
 MessageLoop::Dispatcher* CreateDispatcher();
 #endif
 
 // A singleton object that tracks general state within Aura.
 // TODO(beng): manage RootWindows.
 class AURA_EXPORT Env {
@@ skipping 14 matching lines @@
 
   // Whether any touch device is currently down.
   bool is_touch_down() const { return is_touch_down_; }
   void set_touch_down(bool value) { is_touch_down_ = value; }
 
   client::StackingClient* stacking_client() { return stacking_client_; }
   void set_stacking_client(client::StackingClient* stacking_client) {
     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(); }
   void SetEventFilter(EventFilter* event_filter);
 
   CursorManager* cursor_manager() { return &cursor_manager_; }
 
   // Returns the native event dispatcher. The result should only be passed to
   // MessageLoopForUI::RunWithDispatcher() or
   // MessageLoopForUI::RunAllPendingWithDispatcher(), or used to dispatch
@@ skipping 12 matching lines @@
 
   ObserverList<EnvObserver> observers_;
 #if !defined(OS_MACOSX)
   scoped_ptr<MessageLoop::Dispatcher> dispatcher_;
 #endif
 
   static Env* instance_;
   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);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_