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

ash/wm/window_positioner.cc

 // Copyright 2013 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_positioner.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 63 matching lines @@
          !window_state->bounds_changed_by_user();
 }
 
 // Get the work area for a given |window| in parent coordinates.
 gfx::Rect GetWorkAreaForWindowInParent(aura::Window* window) {
 #if defined(OS_WIN)
   // On Win 8, the host window can't be resized, so
   // use window's bounds instead.
   // TODO(oshima): Emulate host window resize on win8.
   gfx::Rect work_area = gfx::Rect(window->parent()->bounds().size());
-  work_area.Inset(Shell::GetScreen()->GetDisplayMatching(
-      window->parent()->GetBoundsInScreen()).GetWorkAreaInsets());
+  work_area.Inset(
+      gfx::Screen::GetScreen()
+          ->GetDisplayMatching(window->parent()->GetBoundsInScreen())
+          .GetWorkAreaInsets());
   return work_area;
 #else
   return ScreenUtil::GetDisplayWorkAreaBoundsInParent(window);
 #endif
 }
 
 // Move the given |bounds| on the available |work_area| in the direction
 // indicated by |move_right|. If |move_right| is true, the rectangle gets moved
 // to the right edge, otherwise to the left one.
 bool MoveRectToOneSide(const gfx::Rect& work_area,
@@ skipping 354 matching lines @@
     // When the popup position increment is 0, the last popup position
     // was not yet initialized.
     last_popup_position_x_ = popup_position_offset_from_screen_corner_x;
     last_popup_position_y_ = popup_position_offset_from_screen_corner_y;
   }
   pop_position_offset_increment_x = grid;
   pop_position_offset_increment_y = grid;
   // We handle the Multi monitor support by retrieving the active window's
   // work area.
   aura::Window* window = wm::GetActiveWindow();
-  const gfx::Rect work_area = window && window->IsVisible() ?
-      Shell::GetScreen()->GetDisplayNearestWindow(window).work_area() :
-      Shell::GetScreen()->GetPrimaryDisplay().work_area();
+  const gfx::Rect work_area =
+      window && window->IsVisible()
+          ? gfx::Screen::GetScreen()
+                ->GetDisplayNearestWindow(window)
+                .work_area()
+          : gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();
   // Only try to reposition the popup when it is not spanning the entire
   // screen.
   if ((old_pos.width() + popup_position_offset_from_screen_corner_x >=
       work_area.width()) ||
       (old_pos.height() + popup_position_offset_from_screen_corner_y >=
        work_area.height()))
     return AlignPopupPosition(old_pos, work_area, grid);
   const gfx::Rect result = SmartPopupPosition(old_pos, work_area, grid);
   if (!result.IsEmpty())
     return AlignPopupPosition(result, work_area, grid);
@@ skipping 121 matching lines @@
   // If the alignment was pushing the window out of the screen, we ignore the
   // alignment for that call.
   if (abs(pos.right() - work_area.right()) < grid)
     x = work_area.right() - w;
   if (abs(pos.bottom() - work_area.bottom()) < grid)
     y = work_area.bottom() - h;
   return gfx::Rect(x, y, w, h);
 }
 
 }  // namespace ash