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

chrome/browser/ui/window_sizer/window_sizer_ash.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 "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"
@@ skipping 146 matching lines @@
       return true;
 
     gfx::Rect other_bounds_in_screen = top_window->GetBoundsInScreen();
     bool move_right =
         other_bounds_in_screen.CenterPoint().x() < work_area.CenterPoint().x();
 
     // In case we have only one window, we move the other window fully to the
     // "other side" - making room for this new window.
     if (count == 1) {
       gfx::Display display =
-            gfx::Screen::GetDisplayMatching(
+            ash::Shell::GetAshScreen()->GetDisplayMatching(
                 top_window->GetRootWindow()->GetBoundsInScreen());
       if (MoveRect(work_area, other_bounds_in_screen, !move_right))
         top_window->SetBoundsInScreen(other_bounds_in_screen, display);
     }
     // Use the size of the other window, and mirror the location to the
     // opposite side. Then make sure that it is inside our work area
     // (if possible).
     *bounds_in_screen = other_bounds_in_screen;
     MoveRect(work_area, *bounds_in_screen, move_right);
     if (bounds_in_screen->bottom() > work_area.bottom())
@@ skipping 25 matching lines @@
   if (default_width > kMaximumWindowWidth) {
     // The window should get centered on the screen and not follow the grid.
     offset_x = (work_area.width() - kMaximumWindowWidth) / 2;
     default_width = kMaximumWindowWidth;
   }
   default_bounds->SetRect(work_area.x() + offset_x,
                           work_area.y() + kDesktopBorderSize,
                           default_width,
                           default_height);
 }