Use gfx::Screen to provide display information in WindowSizer

chrome/browser/ui/window_sizer/window_sizer.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_H_
 #define CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 
 class Browser;
 
-// An interface implemented by an object that can retrieve information about
-// the monitors on the system.
-class MonitorInfoProvider {
- public:
-  virtual ~MonitorInfoProvider() {}
-
-  // Returns the bounds of the work area of the primary monitor.
-  virtual gfx::Rect GetPrimaryDisplayWorkArea() const = 0;
-
-  // Returns the bounds of the primary monitor.
-  virtual gfx::Rect GetPrimaryDisplayBounds() const = 0;
-
-  // Returns the bounds of the work area of the monitor that most closely
-  // intersects the provided bounds.
-  virtual gfx::Rect GetMonitorWorkAreaMatching(
-      const gfx::Rect& match_rect) const = 0;
-};
+namespace gfx {
+class Screen;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowSizer
 //
 //  A class that determines the best new size and position for a window to be
 //  shown at based several factors, including the position and size of the last
 //  window of the same type, the last saved bounds of the window from the
 //  previous session, and default system metrics if neither of the above two
 //  conditions exist. The system has built-in providers for monitor metrics
 //  and persistent storage (using preferences) but can be overrided with mocks
 //  for testing.
 //
 class WindowSizer {
  public:
   class StateProvider;
 
   // WindowSizer owns |state_provider| and will create a default
   // MonitorInfoProvider using the physical screen.
   WindowSizer(StateProvider* state_provider, const Browser* browser);
 
-  // WindowSizer owns |state_provider| and |monitor_info_provider|.
-  // It will use the supplied monitor info provider. Used only for testing.
+  // WindowSizer owns |state_provider| and will use the supplied |screen|.
+  // Used only for testing.
   WindowSizer(StateProvider* state_provider,
-              MonitorInfoProvider* monitor_info_provider,
+              gfx::Screen* screen,
               const Browser* browser);
 
   virtual ~WindowSizer();
 
   // An interface implemented by an object that can retrieve state from either a
   // persistent store or an existing window.
   class StateProvider {
    public:
     virtual ~StateProvider() {}
 
@@ skipping 111 matching lines @@
   bool GetBoundsOverrideAsh(gfx::Rect* bounds_in_screen,
                             ui::WindowShowState* show_state) const;
 #endif
 
   // Determine the default show state for the window - not looking at other
   // windows or at persistent information.
   ui::WindowShowState GetWindowDefaultShowState() const;
 
   // Providers for persistent storage and monitor metrics.
   scoped_ptr<StateProvider> state_provider_;
-  scoped_ptr<MonitorInfoProvider> monitor_info_provider_;
+  gfx::Screen* screen_;  // not owned.
 
   // Note that this browser handle might be NULL.
   const Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSizer);
 };
 
 #endif  // CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_H_