Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

ash/wm/drag_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/drag_window_resizer.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 82 matching lines @@
 void DragWindowResizer::CompleteDrag() {
   next_window_resizer_->CompleteDrag();
 
   GetTarget()->layer()->SetOpacity(details().initial_opacity);
   drag_window_controllers_.clear();
 
   // Check if the destination is another display.
   gfx::Point last_mouse_location_in_screen = last_mouse_location_;
   ::wm::ConvertPointToScreen(GetTarget()->parent(),
                              &last_mouse_location_in_screen);
-  gfx::Screen* screen = Shell::GetScreen();
+  gfx::Screen* screen = gfx::Screen::GetScreen();
   const gfx::Display dst_display =
       screen->GetDisplayNearestPoint(last_mouse_location_in_screen);
 
   if (dst_display.id() !=
       screen->GetDisplayNearestWindow(GetTarget()->GetRootWindow()).id()) {
     // Adjust the size and position so that it doesn't exceed the size of
     // work area.
     const gfx::Size& size = dst_display.work_area().size();
     gfx::Rect bounds = GetTarget()->bounds();
     if (bounds.width() > size.width()) {
@@ skipping 69 matching lines @@
 
     if (fraction_in_another_window > 0) {
       if (drag_window_controllers_.size() < ++drag_window_controller_count)
         drag_window_controllers_.resize(drag_window_controller_count);
       ScopedVector<DragWindowController>::reference drag_window_controller =
         drag_window_controllers_.back();
       if (!drag_window_controller) {
         drag_window_controller = new DragWindowController(GetTarget());
         // Always show the drag phantom on the |another_root| window.
         drag_window_controller->SetDestinationDisplay(
-            Shell::GetScreen()->GetDisplayNearestWindow(another_root));
+            gfx::Screen::GetScreen()->GetDisplayNearestWindow(another_root));
         drag_window_controller->Show();
       } else {
         // No animation.
         drag_window_controller->SetBounds(bounds_in_screen);
       }
       const float phantom_opacity =
           !in_original_root ? 1 : (kMaxOpacity * fraction_in_another_window);
       const float window_opacity =
           in_original_root ? 1
                            : (kMaxOpacity * (1 - fraction_in_another_window));
@@ skipping 11 matching lines @@
     drag_window_controllers_.resize(drag_window_controller_count);
 }
 
 bool DragWindowResizer::ShouldAllowMouseWarp() {
   return details().window_component == HTCAPTION &&
          !::wm::GetTransientParent(GetTarget()) &&
          wm::IsWindowUserPositionable(GetTarget());
 }
 
 }  // namespace ash