Rename gfx::Monitor to gfx::Display

ash/monitor/multi_monitor_manager.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 ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
 #define ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
 #pragma once
 
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window.h"
 
 namespace gfx {
 class Insets;
-class Monitor;
+class Display;
 }
 
 namespace ash {
 namespace internal {
 
 // MultiMonitorManager maintains the current monitor configurations,
 // and notifies observers when configuration changes.
 // This is exported for unittest.
 //
 // TODO(oshima): gfx::Screen needs to return translated coordinates
 // if the root window is translated. crbug.com/119268.
 class ASH_EXPORT MultiMonitorManager : public aura::MonitorManager,
                                        public aura::RootWindowObserver {
  public:
   MultiMonitorManager();
   virtual ~MultiMonitorManager();
 
   // Used to emulate monitor change when run in a desktop environment instead
   // of on a device.
   static void AddRemoveMonitor();
   static void CycleMonitor();
   static void ToggleMonitorScale();
 
   bool UpdateWorkAreaOfMonitorNearestWindow(const aura::Window* window,
                                             const gfx::Insets& insets);
 
   // MonitorManager overrides:
   virtual void OnNativeMonitorsChanged(
-      const std::vector<gfx::Monitor>& monitors) OVERRIDE;
+      const std::vector<gfx::Display>& displays) OVERRIDE;
   virtual aura::RootWindow* CreateRootWindowForMonitor(
-      const gfx::Monitor& monitor) OVERRIDE;
-  virtual const gfx::Monitor& GetMonitorAt(size_t index) OVERRIDE;
+      const gfx::Display& display) OVERRIDE;
+  virtual const gfx::Display& GetMonitorAt(size_t index) OVERRIDE;
 
   virtual size_t GetNumMonitors() const OVERRIDE;
-  virtual const gfx::Monitor& GetMonitorNearestPoint(
+  virtual const gfx::Display& GetMonitorNearestPoint(
       const gfx::Point& point) const OVERRIDE;
-  virtual const gfx::Monitor& GetMonitorNearestWindow(
+  virtual const gfx::Display& GetMonitorNearestWindow(
       const aura::Window* window) const OVERRIDE;
 
   // RootWindowObserver overrides:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& new_size) OVERRIDE;
 
  private:
-  typedef std::vector<gfx::Monitor> Monitors;
+  typedef std::vector<gfx::Display> Displays;
 
   void Init();
   void AddRemoveMonitorImpl();
   void CycleMonitorImpl();
   void ScaleMonitorImpl();
-  gfx::Monitor& FindMonitorById(int id);
+  gfx::Display& FindDisplayById(int id);
 
-  Monitors monitors_;
+  Displays displays_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiMonitorManager);
 };
 
 extern const aura::WindowProperty<int>* const kMonitorIdKey;
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_MONITOR_MULTI_MONITOR_MANAGER_H_