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

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 83b7aac8f33f1376795a78ea31713dcaef578cc2..79f4eb18031a25a39c0711a5aff3ae54fc03d0c0 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -63,7 +63,6 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
-#include "ui/aura/monitor.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
@@ -71,6 +70,8 @@
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
+#include "ui/gfx/monitor.h"
+#include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/widget/native_widget_aura.h"
@@ -788,11 +789,12 @@ void Shell::RotateFocus(Direction direction) {
 
 void Shell::SetMonitorWorkAreaInsets(Window* contains,
                                      const gfx::Insets& insets) {
-  aura::Monitor* monitor = aura::Env::GetInstance()->monitor_manager()->
+  gfx::Monitor* monitor = aura::Env::GetInstance()->monitor_manager()->
       GetMonitorNearestWindow(contains);
-  if (monitor->work_area_insets() == insets)
+  gfx::Rect old_work_area = monitor->work_area();
+  monitor->UpdateWorkAreaWithInsets(insets);
+  if (old_work_area == monitor->work_area())
     return;
-  monitor->set_work_area_insets(insets);
   FOR_EACH_OBSERVER(ShellObserver, observers_,
                     OnMonitorWorkAreaInsetsChanged());
 }