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

ash/wm/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/window_resizer.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 119 matching lines @@
   // position.  For example, dragging the left edge to the right should stop
   // repositioning the window when the minimize size is reached.
   gfx::Size size = GetSizeForDrag(&delta_x, &delta_y);
   gfx::Point origin = GetOriginForDrag(delta_x, delta_y);
   gfx::Rect new_bounds(origin, size);
 
   // Sizing has to keep the result on the screen. Note that this correction
   // has to come first since it might have an impact on the origin as well as
   // on the size.
   if (details().bounds_change & kBoundsChange_Resizes) {
-    gfx::Rect work_area =
-        Shell::GetScreen()->GetDisplayNearestWindow(GetTarget()).work_area();
+    gfx::Rect work_area = gfx::Screen::GetScreen()
+                              ->GetDisplayNearestWindow(GetTarget())
+                              .work_area();
     aura::Window* dock_container = Shell::GetContainer(
         GetTarget()->GetRootWindow(), kShellWindowId_DockedContainer);
     DockedWindowLayoutManager* dock_layout =
         static_cast<DockedWindowLayoutManager*>(
             dock_container->layout_manager());
 
     work_area.Union(dock_layout->docked_bounds());
     work_area = ScreenUtil::ConvertRectFromScreen(GetTarget()->parent(),
                                                  work_area);
     if (details().size_change_direction & kBoundsChangeDirection_Horizontal) {
@@ skipping 48 matching lines @@
     // Make sure that |new_bounds| doesn't leave any of the displays.  Note that
     // the |work_area| above isn't good for this check since it is the work area
     // for the current display but the window can move to a different one.
     aura::Window* parent = GetTarget()->parent();
     gfx::Point passed_location_in_screen(passed_location);
     ::wm::ConvertPointToScreen(parent, &passed_location_in_screen);
     gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size());
     // Use a pointer location (matching the logic in DragWindowResizer) to
     // calculate the target display after the drag.
     const gfx::Display& display =
-        Shell::GetScreen()->GetDisplayMatching(near_passed_location);
+        gfx::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
     aura::Window* dock_container =
         Shell::GetContainer(wm::GetRootWindowMatching(near_passed_location),
                             kShellWindowId_DockedContainer);
     DockedWindowLayoutManager* dock_layout =
         static_cast<DockedWindowLayoutManager*>(
             dock_container->layout_manager());
 
     gfx::Rect screen_work_area = display.work_area();
     screen_work_area.Union(dock_layout->docked_bounds());
     screen_work_area.Inset(kMinimumOnScreenArea, 0);
@@ skipping 80 matching lines @@
 
     // Ensure we don't shrink past the minimum width and clamp delta_x
     // for the window origin computation.
     if (width < min_width) {
       width = min_width;
       *delta_x = -x_multiplier * (details().initial_bounds_in_parent.width() -
                                   min_width);
     }
 
     // And don't let the window go bigger than the display.
-    int max_width = Shell::GetScreen()->GetDisplayNearestWindow(
-        GetTarget()).bounds().width();
+    int max_width = gfx::Screen::GetScreen()
+                        ->GetDisplayNearestWindow(GetTarget())
+                        .bounds()
+                        .width();
     gfx::Size max_size = GetTarget()->delegate()->GetMaximumSize();
     if (max_size.width() != 0)
       max_width = std::min(max_width, max_size.width());
     if (width > max_width) {
       width = max_width;
       *delta_x = -x_multiplier * (details().initial_bounds_in_parent.width() -
                                   max_width);
     }
   }
   return width;
 }
 
 int WindowResizer::GetHeightForDrag(int min_height, int* delta_y) {
   int height = details().initial_bounds_in_parent.height();
   if (details().size_change_direction & kBoundsChangeDirection_Vertical) {
     // Along the bottom edge, positive delta_y increases the window size.
     int y_multiplier = IsBottomEdge(details().window_component) ? 1 : -1;
     height += y_multiplier * (*delta_y);
 
     // Ensure we don't shrink past the minimum height and clamp delta_y
     // for the window origin computation.
     if (height < min_height) {
       height = min_height;
       *delta_y = -y_multiplier * (details().initial_bounds_in_parent.height() -
                                   min_height);
     }
 
     // And don't let the window go bigger than the display.
-    int max_height = Shell::GetScreen()->GetDisplayNearestWindow(
-        GetTarget()).bounds().height();
+    int max_height = gfx::Screen::GetScreen()
+                         ->GetDisplayNearestWindow(GetTarget())
+                         .bounds()
+                         .height();
     gfx::Size max_size = GetTarget()->delegate()->GetMaximumSize();
     if (max_size.height() != 0)
       max_height = std::min(max_height, max_size.height());
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (details().initial_bounds_in_parent.height() -
                                   max_height);
     }
   }
   return height;
 }
 
 }  // namespace ash