Add context to gfx::Screen calls in support of simultaneous desktop+ash

chrome/browser/ui/window_sizer/window_sizer.cc

Index: chrome/browser/ui/window_sizer/window_sizer.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
index 57d0426147fed45c8d9cf955010bb3284c397fbb..adcbf02557702b4812d97a189d26fe706504cb17 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -25,17 +25,20 @@ const int kMinVisibleWidth = 30;
 
 class DefaultMonitorInfoProvider : public MonitorInfoProvider {
  public:
+  DefaultMonitorInfoProvider(gfx::Screen* screen) : screen_(screen) {}

[oshima, 2012/10/10 20:08:39]

const gfx::Screen*

[scottmg, 2012/10/10 20:52:01]

Done.

   // Overridden from MonitorInfoProvider:
   virtual gfx::Rect GetPrimaryDisplayWorkArea() const OVERRIDE {
-    return gfx::Screen::GetPrimaryDisplay().work_area();
+    return screen_->GetPrimaryDisplay().work_area();
   }
   virtual gfx::Rect GetPrimaryDisplayBounds() const OVERRIDE {
-    return gfx::Screen::GetPrimaryDisplay().bounds();
+    return screen_->GetPrimaryDisplay().bounds();
   }
   virtual gfx::Rect GetMonitorWorkAreaMatching(
       const gfx::Rect& match_rect) const OVERRIDE {
-    return gfx::Screen::GetDisplayMatching(match_rect).work_area();
+    return screen_->GetDisplayMatching(match_rect).work_area();
   }
+ private:
+  gfx::Screen* screen_;

[oshima, 2012/10/10 20:08:39]

const

DISALLOW_COPY_AND_ASSIGN

[scottmg, 2012/10/10 20:52:01]

Done.

 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -150,7 +153,8 @@ const int WindowSizer::kMaximumWindowWidth = 1100;
 
 WindowSizer::WindowSizer(StateProvider* state_provider, const Browser* browser)
     : state_provider_(state_provider),
-      monitor_info_provider_(new DefaultMonitorInfoProvider),
+      monitor_info_provider_(new DefaultMonitorInfoProvider(
+          gfx::Screen::GetScreenFor(browser->window()->GetNativeWindow()))),
       browser_(browser) {
 }