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

chrome/browser/ui/window_sizer/window_sizer.h

Index: chrome/browser/ui/window_sizer/window_sizer.h
diff --git a/chrome/browser/ui/window_sizer/window_sizer.h b/chrome/browser/ui/window_sizer/window_sizer.h
index 865f99b691ccc0d9a805fc2337a6482dacdb388c..4e0a708e7436ca961dfc610c841dcf1d3901ebab 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.h
+++ b/chrome/browser/ui/window_sizer/window_sizer.h
@@ -81,7 +81,8 @@ class WindowSizer {
   // algorithm. If |specified_bounds| are non-empty, this value is returned
   // instead. For use only in testing.
   void DetermineWindowBounds(const gfx::Rect& specified_bounds,
-                             gfx::Rect* bounds) const;
+                             gfx::Rect* bounds,
+                             const Browser* browser) const;
 
   // Determines the size, position and maximized state for the browser window.
   // See documentation for DetermineWindowBounds above. Normally,
@@ -115,18 +116,19 @@ class WindowSizer {
   // Gets the size and placement of the last window. Returns true if this data
   // is valid, false if there is no last window and the application should
   // restore saved state from preferences using RestoreWindowPosition.
-  bool GetLastWindowBounds(gfx::Rect* bounds) const;
+  bool GetLastWindowBounds(gfx::Rect* bounds, const Browser* browser) const;
 
   // Gets the size and placement of the last window in the last session, saved
   // in local state preferences. Returns true if local state exists containing
   // this information, false if this information does not exist and a default
   // size should be used.
-  bool GetSavedWindowBounds(gfx::Rect* bounds) const;
+  bool GetSavedWindowBounds(gfx::Rect* bounds, const Browser* browser) const;
 
   // Gets the default window position and size if there is no last window and
   // no saved window placement in prefs. This function determines the default
   // size based on monitor size, etc.
-  void GetDefaultWindowBounds(gfx::Rect* default_bounds) const;
+  void GetDefaultWindowBounds(gfx::Rect* default_bounds,
+                              const Browser* browser) const;
 #if defined(USE_ASH)
   void GetDefaultWindowBoundsAsh(gfx::Rect* default_bounds) const;
 #endif
@@ -142,17 +144,20 @@ class WindowSizer {
   void AdjustBoundsToBeVisibleOnMonitorContaining(
       const gfx::Rect& other_bounds,
       const gfx::Rect& saved_work_area,
-      gfx::Rect* bounds) const;
+      gfx::Rect* bounds,
+      const Browser* browser) const;
 
   // Determines the position and size for a window as it gets created. This
   // will be called before DetermineWindowBounds. It will return true when the
   // function was setting the bounds structure to the desired size. Otherwise
   // another algorithm should get used to determine the correct bounds.
   bool GetBoundsOverride(const gfx::Rect& specified_bounds,
-                         gfx::Rect* bounds) const;
+                         gfx::Rect* bounds,
+                         const Browser* browser) const;
 #if defined(USE_ASH)
   bool GetBoundsOverrideAsh(const gfx::Rect& specified_bounds,
-                            gfx::Rect* bounds_in_screen) const;
+                            gfx::Rect* bounds_in_screen,
+                            const Browser* browser) const;
 #endif
 
   // Providers for persistent storage and monitor metrics.