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

chrome/browser/ui/window_sizer.cc

Index: chrome/browser/ui/window_sizer.cc
diff --git a/chrome/browser/ui/window_sizer.cc b/chrome/browser/ui/window_sizer.cc
index 38b7cfe759bd5c34d2a7915894b5b7e55be8f76f..0891d3197b8f92b7ef91fd56e1d811774694a0d3 100644
--- a/chrome/browser/ui/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/pref_names.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 
 // Minimum height of the visible part of a window.
@@ -23,14 +24,14 @@ class DefaultMonitorInfoProvider : public MonitorInfoProvider {
  public:
   // Overridden from MonitorInfoProvider:
   virtual gfx::Rect GetPrimaryMonitorWorkArea() const OVERRIDE {
-    return gfx::Screen::GetPrimaryMonitorWorkArea();
+    return gfx::Screen::GetPrimaryMonitor()->GetWorkArea();
   }
   virtual gfx::Rect GetPrimaryMonitorBounds() const OVERRIDE {
-    return gfx::Screen::GetPrimaryMonitorBounds();
+    return gfx::Screen::GetPrimaryMonitor()->GetBounds();
   }
   virtual gfx::Rect GetMonitorWorkAreaMatching(
       const gfx::Rect& match_rect) const OVERRIDE {
-    return gfx::Screen::GetMonitorWorkAreaMatching(match_rect);
+    return gfx::Screen::GetMonitorMatching(match_rect)->GetBounds();
   }
 };