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

ui/aura/monitor_manager.cc

Index: ui/aura/monitor_manager.cc
diff --git a/ui/aura/monitor_manager.cc b/ui/aura/monitor_manager.cc
index de23f581d90de1a6cc4f687e8a02019c4a01da3f..65d767b44f4fe5a03796f3e3aba884a353c9549b 100644
--- a/ui/aura/monitor_manager.cc
+++ b/ui/aura/monitor_manager.cc
@@ -8,10 +8,11 @@
 
 #include "base/logging.h"
 #include "ui/aura/env.h"
-#include "ui/aura/monitor.h"
+#include "ui/aura/monitor_aura.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/monitor_observer.h"
 
 namespace aura {
 namespace {
@@ -26,7 +27,7 @@ static const int kDefaultHostWindowHeight = 1024;
 bool MonitorManager::use_fullscreen_host_window_ = false;
 
 // static
-Monitor* MonitorManager::CreateMonitorFromSpec(const std::string& spec) {
+MonitorAura* MonitorManager::CreateMonitorFromSpec(const std::string& spec) {
   gfx::Rect bounds(kDefaultHostWindowX, kDefaultHostWindowY,
                    kDefaultHostWindowWidth, kDefaultHostWindowHeight);
   int x = 0, y = 0, width, height;
@@ -39,8 +40,9 @@ Monitor* MonitorManager::CreateMonitorFromSpec(const std::string& spec) {
   } else if (use_fullscreen_host_window_) {
     bounds = gfx::Rect(aura::RootWindowHost::GetNativeScreenSize());
   }
-  Monitor* monitor = new Monitor();
+  MonitorAura* monitor = new MonitorAura();
   monitor->set_bounds(bounds);
+  monitor->set_device_scale_factor(scale);
   VLOG(1) << "Monitor bounds=" << bounds.ToString() << ", scale=" << scale;
   return monitor;
 }
@@ -61,26 +63,26 @@ MonitorManager::MonitorManager() {
 MonitorManager::~MonitorManager() {
 }
 
-void MonitorManager::AddObserver(MonitorObserver* observer) {
+void MonitorManager::AddObserver(gfx::MonitorObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void MonitorManager::RemoveObserver(MonitorObserver* observer) {
+void MonitorManager::RemoveObserver(gfx::MonitorObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void MonitorManager::NotifyBoundsChanged(const Monitor* monitor) {
-  FOR_EACH_OBSERVER(MonitorObserver, observers_,
+void MonitorManager::NotifyBoundsChanged(const gfx::Monitor* monitor) {
+  FOR_EACH_OBSERVER(gfx::MonitorObserver, observers_,
                     OnMonitorBoundsChanged(monitor));
 }
 
-void MonitorManager::NotifyMonitorAdded(Monitor* monitor) {
-  FOR_EACH_OBSERVER(MonitorObserver, observers_,
+void MonitorManager::NotifyMonitorAdded(gfx::Monitor* monitor) {
+  FOR_EACH_OBSERVER(gfx::MonitorObserver, observers_,
                     OnMonitorAdded(monitor));
 }
 
-void MonitorManager::NotifyMonitorRemoved(const Monitor* monitor) {
-  FOR_EACH_OBSERVER(MonitorObserver, observers_,
+void MonitorManager::NotifyMonitorRemoved(const gfx::Monitor* monitor) {
+  FOR_EACH_OBSERVER(gfx::MonitorObserver, observers_,
                     OnMonitorRemoved(monitor));
 }