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

ash/monitor/multi_monitor_manager.h

Index: ash/monitor/multi_monitor_manager.h
diff --git a/ash/monitor/multi_monitor_manager.h b/ash/monitor/multi_monitor_manager.h
index 2bbfcbb4b73cbdf8fd6c0acaf177cfac6694646d..c2813c3f60b9d048ad343c82eed3cf6f53acc3cb 100644
--- a/ash/monitor/multi_monitor_manager.h
+++ b/ash/monitor/multi_monitor_manager.h
@@ -35,16 +35,17 @@ class ASH_EXPORT MultiMonitorManager : public aura::MonitorManager,
 
   // MonitorManager overrides:
   virtual void OnNativeMonitorsChanged(
-      const std::vector<const aura::Monitor*>& monitors) OVERRIDE;
+      const std::vector<const aura::MonitorAura*>& monitors) OVERRIDE;
   virtual aura::RootWindow* CreateRootWindowForMonitor(
-      aura::Monitor* monitor) OVERRIDE;
-  virtual const aura::Monitor* GetMonitorNearestWindow(
+      aura::MonitorAura* monitor) OVERRIDE;
+  virtual aura::MonitorAura* GetMonitorAt(size_t index) OVERRIDE;
+
+  virtual size_t GetNumMonitors() const OVERRIDE;
+  virtual const aura::MonitorAura* GetMonitorNearestWindow(
       const aura::Window* window) const OVERRIDE;
-  virtual const aura::Monitor* GetMonitorNearestPoint(
+  virtual const aura::MonitorAura* GetMonitorNearestPoint(
       const gfx::Point& point) const OVERRIDE;
-  virtual aura::Monitor* GetMonitorAt(size_t index) OVERRIDE;
-  virtual size_t GetNumMonitors() const OVERRIDE;
-  virtual aura::Monitor* GetMonitorNearestWindow(
+  virtual aura::MonitorAura* GetMonitorNearestWindow(
       const aura::Window* window) OVERRIDE;
 
   // RootWindowObserver overrides:
@@ -52,7 +53,7 @@ class ASH_EXPORT MultiMonitorManager : public aura::MonitorManager,
                                    const gfx::Size& new_size) OVERRIDE;
 
  private:
-  typedef std::vector<aura::Monitor*> Monitors;
+  typedef std::vector<aura::MonitorAura*> Monitors;
 
   void Init();
   void AddRemoveMonitorImpl();
@@ -63,7 +64,7 @@ class ASH_EXPORT MultiMonitorManager : public aura::MonitorManager,
   DISALLOW_COPY_AND_ASSIGN(MultiMonitorManager);
 };
 
-extern const aura::WindowProperty<aura::Monitor*>* const kMonitorKey;
+extern const aura::WindowProperty<aura::MonitorAura*>* const kMonitorKey;
 
 }  // namespace internal
 }  // namespace ash