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

ash/wm/frame_painter.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 "ash/wm/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
@@ skipping 656 matching lines @@
   return kInactiveWindowOpacity;
 }
 
 int FramePainter::AdjustFrameHitCodeForMaximizedModes(int hit_code) {
   if (hit_code != HTNOWHERE && wm::IsWindowNormal(window_) &&
       GetRestoreBoundsInScreen(window_)) {
     // When there is a restore rectangle, a left/right maximized window might
     // be active.
     const gfx::Rect& bounds = frame_->GetWindowBoundsInScreen();
     const gfx::Rect& screen =
-        gfx::Screen::GetDisplayMatching(bounds).work_area();
+        Shell::GetAshScreen()->GetDisplayMatching(bounds).work_area();
     if (bounds.y() == screen.y() && bounds.bottom() == screen.bottom()) {
       // The window is probably either left or right maximized.
       if (bounds.x() == screen.x()) {
         // It is left maximized and we can only allow a right resize.
         return (hit_code == HTBOTTOMRIGHT ||
                 hit_code == HTTOPRIGHT ||
                 hit_code == HTRIGHT) ? HTRIGHT : HTNOWHERE;
       } else if (bounds.right() == screen.right()) {
         // It is right maximized and we can only allow a left resize.
         return (hit_code == HTBOTTOMLEFT ||
@@ skipping 92 matching lines @@
   int title_y =
       (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
       title_font.GetHeight());
 }
 
 }  // namespace ash