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

ash/wm/workspace/workspace_window_resizer.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/workspace_window_resizer.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 #include <vector>
@@ skipping 175 matching lines @@
                                          details_.restore_bounds);
     window()->SetBounds(snap_sizer_->target_bounds());
     return;
   }
 
   gfx::Rect bounds(GetFinalBounds(window()->bounds()));
 
   // Check if the destination is another display.
   gfx::Point last_mouse_location_in_screen = last_mouse_location_;
   wm::ConvertPointToScreen(window()->parent(), &last_mouse_location_in_screen);
+  gfx::Screen* screen = Shell::GetScreen();
   const gfx::Display dst_display =
-      gfx::Screen::GetDisplayNearestPoint(last_mouse_location_in_screen);
+      screen->GetDisplayNearestPoint(last_mouse_location_in_screen);
 
   if (dst_display.id() !=
-      gfx::Screen::GetDisplayNearestWindow(window()->GetRootWindow()).id()) {
+      screen->GetDisplayNearestWindow(window()->GetRootWindow()).id()) {
     // Don't animate when moving to another display.
     const gfx::Rect dst_bounds =
         ScreenAsh::ConvertRectToScreen(window()->parent(), bounds);
     window()->SetBoundsInScreen(dst_bounds, dst_display);
   }
 }
 
 void WorkspaceWindowResizer::RevertDrag() {
   window()->layer()->SetOpacity(details_.initial_opacity);
   drag_phantom_window_controller_.reset();
@@ skipping 208 matching lines @@
     }
   }
 }
 
 void WorkspaceWindowResizer::AdjustBoundsForMainWindow(
     gfx::Rect* bounds,
     int grid_size) {
 
   gfx::Point last_mouse_location_in_screen = last_mouse_location_;
   wm::ConvertPointToScreen(window()->parent(), &last_mouse_location_in_screen);
-  gfx::Display display =
-      gfx::Screen::GetDisplayNearestPoint(last_mouse_location_in_screen);
+  gfx::Display display = Shell::GetScreen()->GetDisplayNearestPoint(
+      last_mouse_location_in_screen);
   gfx::Rect work_area =
       ScreenAsh::ConvertRectFromScreen(window()->parent(), display.work_area());
   if (details_.window_component == HTCAPTION) {
     // Adjust the bounds to the work area where the mouse cursor is located.
     // Always keep kMinOnscreenHeight on the bottom.
     int max_y = work_area.bottom() - kMinOnscreenHeight;
     if (bounds->y() > max_y) {
       bounds->set_y(max_y);
     } else if (bounds->y() <= work_area.y()) {
       // Don't allow dragging above the top of the display until the mouse
@@ skipping 96 matching lines @@
       in_original_root ? 1 : (kMaxOpacity * (1 - fraction_in_another_window));
 
   if (fraction_in_another_window > 0) {
     if (!drag_phantom_window_controller_.get()) {
       drag_phantom_window_controller_.reset(
           new PhantomWindowController(window()));
       drag_phantom_window_controller_->set_style(
           PhantomWindowController::STYLE_DRAGGING);
       // Always show the drag phantom on the |another_root| window.
       drag_phantom_window_controller_->SetDestinationDisplay(
-          gfx::Screen::GetDisplayMatching(another_root->GetBoundsInScreen()));
+          Shell::GetScreen()->GetDisplayMatching(
+              another_root->GetBoundsInScreen()));
       if (!layer_)
         RecreateWindowLayers();
       drag_phantom_window_controller_->Show(bounds_in_screen, layer_);
     } else {
       // No animation.
       drag_phantom_window_controller_->SetBounds(bounds_in_screen);
     }
     drag_phantom_window_controller_->SetOpacity(phantom_opacity);
     window()->layer()->SetOpacity(window_opacity);
   } else {
@@ skipping 87 matching lines @@
   gfx::Rect layer_bounds = layer_->bounds();
   layer_bounds.set_origin(gfx::Point(0, 0));
   layer_->SetBounds(layer_bounds);
   layer_->SetVisible(false);
   // Detach it from the current container.
   layer_->parent()->Remove(layer_);
 }
 
 }  // namespace internal
 }  // namespace ash