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

ui/aura/monitor_change_observer_x11.cc

Index: ui/aura/monitor_change_observer_x11.cc
diff --git a/ui/aura/monitor_change_observer_x11.cc b/ui/aura/monitor_change_observer_x11.cc
index bb2904f1c2534982b08cd07f1ee21e75214ab31a..9dedddd06d95b34c1b66b7a752a8d95fd332f14d 100644
--- a/ui/aura/monitor_change_observer_x11.cc
+++ b/ui/aura/monitor_change_observer_x11.cc
@@ -15,7 +15,7 @@
 #include "base/stl_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/dispatcher_linux.h"
-#include "ui/aura/monitor.h"
+#include "ui/aura/monitor_aura.h"
 #include "ui/aura/monitor_manager.h"
 
 namespace aura {
@@ -31,7 +31,7 @@ XRRModeInfo* FindMode(XRRScreenResources* screen_resources, XID current_mode) {
   return NULL;
 }
 
-bool CompareMonitorY(const Monitor* lhs, const Monitor* rhs) {
+bool CompareMonitorY(const MonitorAura* lhs, const MonitorAura* rhs) {
   return lhs->bounds().y() < rhs->bounds().y();
 }
 
@@ -77,7 +77,7 @@ void MonitorChangeObserverX11::NotifyMonitorChange() {
     crtc_info_map[crtc_id] = crtc_info;
   }
 
-  std::vector<const Monitor*> monitors;
+  std::vector<const MonitorAura*> monitors;
   std::set<int> y_coords;
   for (int o = 0; o < screen_resources->noutput; o++) {
     XRROutputInfo *output_info =
@@ -98,7 +98,7 @@ void MonitorChangeObserverX11::NotifyMonitorChange() {
     // Mirrored monitors have the same y coordinates.
     if (y_coords.find(crtc_info->y) != y_coords.end())
       continue;
-    Monitor* monitor = new Monitor;
+    MonitorAura* monitor = new MonitorAura;
     monitor->set_bounds(gfx::Rect(crtc_info->x, crtc_info->y,
                                   mode->width, mode->height));
     monitors.push_back(monitor);