Refactor screen/monitor so that gfx::Screen returns monitor object.

ui/aura/monitor_manager.h

Index: ui/aura/monitor_manager.h
diff --git a/ui/aura/monitor_manager.h b/ui/aura/monitor_manager.h
index 9bbd028df9173d6d1b754d4c347a68d6ad2a10bd..8c7e46f98983b4f8b15d9b32d3c70055385ba766 100644
--- a/ui/aura/monitor_manager.h
+++ b/ui/aura/monitor_manager.h
@@ -14,24 +14,17 @@
 #include "ui/aura/aura_export.h"
 
 namespace gfx {
+class Monitor;
+class MonitorObserver;
 class Point;
 class Size;
 }
 
 namespace aura {
-class Monitor;
+class MonitorAura;
 class RootWindow;
 class Window;
 
-// Observers for monitor configuration changes.
-// TODO(oshima): multiple monitor support.
-class MonitorObserver {
- public:
-  virtual void OnMonitorBoundsChanged(const Monitor* monitor) = 0;
-  virtual void OnMonitorAdded(Monitor* new_monitor) = 0;
-  virtual void OnMonitorRemoved(const Monitor* old_monitor) = 0;
-};
-
 // MonitorManager creates, deletes and updates Monitor objects when
 // monitor configuration changes, and notifies MonitorObservers about
 // the change. This is owned by Env and its lifetime is longer than
@@ -50,7 +43,7 @@ class AURA_EXPORT MonitorManager {
   // The location can be omitted and be just "1440x800", which creates
   // monitor at the origin of the screen. An empty string creates
   // the monitor with default size.
-  static Monitor* CreateMonitorFromSpec(const std::string& spec);
+  static MonitorAura* CreateMonitorFromSpec(const std::string& spec);
 
   // A utility function to create a root window for primary monitor.
   static RootWindow* CreateRootWindowForPrimaryMonitor();
@@ -59,38 +52,38 @@ class AURA_EXPORT MonitorManager {
   virtual ~MonitorManager();
 
   // Adds/removes MonitorObservers.
-  void AddObserver(MonitorObserver* observer);
-  void RemoveObserver(MonitorObserver* observer);
+  void AddObserver(gfx::MonitorObserver* observer);
+  void RemoveObserver(gfx::MonitorObserver* observer);
 
   // Called when monitor configuration has changed. The new monitor
   // configurations is passed as a vector of Monitor object, which
   // contains each monitor's new infomration.
   virtual void OnNativeMonitorsChanged(
-      const std::vector<const Monitor*>& monitors) = 0;
+      const std::vector<const MonitorAura*>& monitors) = 0;
 
   // Create a root window for given |monitor|.
-  virtual RootWindow* CreateRootWindowForMonitor(Monitor* monitor) = 0;
+  virtual RootWindow* CreateRootWindowForMonitor(MonitorAura* monitor) = 0;
+
+  // Returns the monitor at |index|. The monitor at 0 is considered
+  // "primary".
+  virtual MonitorAura* GetMonitorAt(size_t index) = 0;
+
+  virtual size_t GetNumMonitors() const = 0;
 
   // Returns the monitor object nearest given |window|.
-  virtual const Monitor* GetMonitorNearestWindow(
+  virtual const MonitorAura* GetMonitorNearestWindow(
       const Window* window) const = 0;
-  virtual Monitor* GetMonitorNearestWindow(const Window* window) = 0;
+  virtual MonitorAura* GetMonitorNearestWindow(const Window* window) = 0;
 
   // Returns the monitor object nearest given |pint|.
-  virtual  const Monitor* GetMonitorNearestPoint(
+  virtual const MonitorAura* GetMonitorNearestPoint(
       const gfx::Point& point) const = 0;
 
-  // Returns the monitor at |index|. The monitor at 0 is considered
-  // "primary".
-  virtual Monitor* GetMonitorAt(size_t index) = 0;
-
-  virtual size_t GetNumMonitors() const = 0;
-
  protected:
   // Calls observers' OnMonitorBoundsChanged methods.
-  void NotifyBoundsChanged(const Monitor* monitor);
-  void NotifyMonitorAdded(Monitor* monitor);
-  void NotifyMonitorRemoved(const Monitor* monitor);
+  void NotifyBoundsChanged(const gfx::Monitor* monitor);
+  void NotifyMonitorAdded(gfx::Monitor* monitor);
+  void NotifyMonitorRemoved(const gfx::Monitor* monitor);
 
  private:
   // If set before the RootWindow is created, the host window will cover the
@@ -98,7 +91,7 @@ class AURA_EXPORT MonitorManager {
   // switches::kAuraHostWindowSize flag.
   static bool use_fullscreen_host_window_;
 
-  ObserverList<MonitorObserver> observers_;
+  ObserverList<gfx::MonitorObserver> observers_;
   DISALLOW_COPY_AND_ASSIGN(MonitorManager);
 };