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

chrome/browser/ui/window_sizer/window_sizer.cc

 // 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.
 
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 
 #include "base/compiler_specific.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/chrome_switches.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:
+  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.

 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // 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 94 matching lines @@
 // gets positioned to its default location.
 // static
 const int WindowSizer::kDesktopBorderSize = 16;
 
 // Maximum width of a window even if there is more room on the desktop.
 // static
 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) {
 }
 
 WindowSizer::WindowSizer(StateProvider* state_provider,
                          MonitorInfoProvider* monitor_info_provider,
                          const Browser* browser)
     : state_provider_(state_provider),
       monitor_info_provider_(monitor_info_provider),
       browser_(browser) {
 }
@@ skipping 225 matching lines @@
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized))
     return ui::SHOW_STATE_MAXIMIZED;
 
   if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT)
     return browser_->initial_show_state();
 
   // Otherwise we use the default which can be overridden later on.
   return ui::SHOW_STATE_DEFAULT;
 }