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

chrome/browser/ui/window_sizer/window_sizer_ash.cc

Index: chrome/browser/ui/window_sizer/window_sizer_ash.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
index 3b0ac138fcd905227989112182d9eecf0ba1cb0e..4bef358c6e3ba996d7d7d6d0ea19acdabe963637 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
@@ -120,12 +120,13 @@ bool MoveRect(const gfx::Rect& work_area,
 }  // namespace
 
 bool WindowSizer::GetBoundsOverrideAsh(const gfx::Rect& specified_bounds,
-                                       gfx::Rect* bounds_in_screen) const {
+                                       gfx::Rect* bounds_in_screen,
+                                       const Browser* browser) const {
   *bounds_in_screen = specified_bounds;
   DCHECK(bounds_in_screen->IsEmpty());
 
-  if (!GetSavedWindowBounds(bounds_in_screen))
-    GetDefaultWindowBounds(bounds_in_screen);
+  if (!GetSavedWindowBounds(bounds_in_screen, browser))
+    GetDefaultWindowBounds(bounds_in_screen, browser);
 
   if (browser_ && browser_->is_type_tabbed()) {
     gfx::Rect work_area =
@@ -147,6 +148,7 @@ bool WindowSizer::GetBoundsOverrideAsh(const gfx::Rect& specified_bounds,
     if (count == 1) {
       gfx::Display display =
             gfx::Screen::GetDisplayMatching(
+                gfx::Screen::BadTwoWorldsContext(),
                 top_window->GetRootWindow()->GetBoundsInScreen());
       if (MoveRect(work_area, other_bounds_in_screen, !move_right))
         top_window->SetBoundsInScreen(other_bounds_in_screen, display);