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

chrome/browser/ui/window_sizer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/window_sizer.h"
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #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.
 const int kMinVisibleHeight = 30;
 // Minimum width of the visible part of a window.
 const int kMinVisibleWidth = 30;
 
 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();
   }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // An implementation of WindowSizer::StateProvider that gets the last active
 // and persistent state from the browser window and the user's profile.
 class DefaultStateProvider : public WindowSizer::StateProvider {
  public:
   DefaultStateProvider(const std::string& app_name, const Browser* browser)
       : app_name_(app_name), browser_(browser) {
@@ skipping 259 matching lines @@
 #endif  // defined(OS_MACOSX)
 }
 
 #if !defined(USE_ASH)
 bool WindowSizer::GetBoundsIgnoringPreviousState(
     const gfx::Rect& specified_bounds,
     gfx::Rect* bounds) const {
   return false;
 }
 #endif