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

ash/wm/workspace/frame_maximize_button.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/workspace/frame_maximize_button.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_bubble_controller.h"
@@ skipping 218 matching lines @@
         bubble_appearance_delay_ms_));
   }
 }
 
 void FrameMaximizeButton::OnMouseExited(const ui::MouseEvent& event) {
   ImageButton::OnMouseExited(event);
   // Remove the bubble menu when the button is not pressed and the mouse is not
   // within the bubble.
   if (!is_snap_enabled_ && maximizer_.get()) {
     if (maximizer_->GetBubbleWindow()) {
-      gfx::Point screen_location = gfx::Screen::GetCursorScreenPoint();
+      gfx::Point screen_location = Shell::GetScreen()->GetCursorScreenPoint();
       if (!maximizer_->GetBubbleWindow()->GetBoundsInScreen().Contains(
               screen_location)) {
         maximizer_.reset();
         // Make sure that all remaining snap hover states get removed.
         SnapButtonHovered(SNAP_NONE);
       }
     } else {
       // The maximize dialog does not show up immediately after creating the
       // |mazimizer_|. Destroy the dialog therefore before it shows up.
       maximizer_.reset();
@@ skipping 304 matching lines @@
    FrameMaximizeButton::GetMaximizeBubbleFrameState() const {
   // When there are no restore bounds, we are in normal mode.
   if (!ash::GetRestoreBoundsInScreen(
            frame_->GetWidget()->GetNativeWindow()))
     return FRAME_STATE_NONE;
   // The normal maximized test can be used.
   if (frame_->GetWidget()->IsMaximized())
     return FRAME_STATE_FULL;
   // For Left/right maximize we need to check the dimensions.
   gfx::Rect bounds = frame_->GetWidget()->GetWindowBoundsInScreen();
-  gfx::Rect screen = gfx::Screen::GetDisplayMatching(bounds).work_area();
+  gfx::Rect screen = Shell::GetScreen()->GetDisplayMatching(bounds).work_area();
   if (bounds.width() < (screen.width() * kMinSnapSizePercent) / 100)
     return FRAME_STATE_NONE;
   // We might still have a horizontally filled window at this point which we
   // treat as no special state.
   if (bounds.y() != screen.y() || bounds.height() != screen.height())
     return FRAME_STATE_NONE;
 
   // We have to be in a maximize mode at this point.
   if (bounds.x() == screen.x())
     return FRAME_STATE_SNAP_LEFT;
   if (bounds.right() == screen.right())
     return FRAME_STATE_SNAP_RIGHT;
   // If we come here, it is likely caused by the fact that the
   // "VerticalResizeDoubleClick" stored a restore rectangle. In that case
   // we allow all maximize operations (and keep the restore rectangle).
   return FRAME_STATE_NONE;
 }
 
 }  // namespace ash