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

ash/display/extended_mouse_warp_controller.cc

 // Copyright 2015 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/display/extended_mouse_warp_controller.h"
 
 #include <cmath>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
@@ skipping 40 matching lines @@
   if (drag_source) {
     shared_display_edge_indicator_->Show(src_indicator_bounds_,
                                          dst_indicator_bounds_);
   }
 }
 
 ExtendedMouseWarpController::~ExtendedMouseWarpController() {
 }
 
 bool ExtendedMouseWarpController::WarpMouseCursor(ui::MouseEvent* event) {
-  if (Shell::GetScreen()->GetNumDisplays() <= 1 || !enabled_)
+  if (gfx::Screen::GetScreen()->GetNumDisplays() <= 1 || !enabled_)
     return false;
 
   aura::Window* target = static_cast<aura::Window*>(event->target());
   gfx::Point point_in_screen = event->location();
   ::wm::ConvertPointToScreen(target, &point_in_screen);
 
   // A native event may not exist in unit test. Generate the native point
   // from the screen point instead.
   if (!event->HasNativeEvent()) {
     if (!allow_non_native_event_)
@@ skipping 43 matching lines @@
 
   MoveCursorTo(target_ash_host, point_in_screen, update_mouse_location_now);
   return true;
 }
 
 void ExtendedMouseWarpController::UpdateHorizontalEdgeBounds() {
   bool from_primary = Shell::GetPrimaryRootWindow() == drag_source_root_;
   // GetPrimaryDisplay returns an object on stack, so copy the bounds
   // instead of using reference.
   const gfx::Rect primary_bounds =
-      Shell::GetScreen()->GetPrimaryDisplay().bounds();
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();
   const gfx::Rect secondary_bounds = ScreenUtil::GetSecondaryDisplay().bounds();
   DisplayLayout::Position position = Shell::GetInstance()
                                          ->display_manager()
                                          ->GetCurrentDisplayLayout()
                                          .position;
 
   src_indicator_bounds_.set_x(
       std::max(primary_bounds.x(), secondary_bounds.x()));
   src_indicator_bounds_.set_width(
       std::min(primary_bounds.right(), secondary_bounds.right()) -
@@ skipping 20 matching lines @@
   dst_edge_bounds_in_native_ = GetNativeEdgeBounds(
       GetRootWindowController(dst_root)->ash_host(), dst_indicator_bounds_);
 }
 
 void ExtendedMouseWarpController::UpdateVerticalEdgeBounds() {
   int snap_height = drag_source_root_ ? kMaximumSnapHeight : 0;
   bool in_primary = Shell::GetPrimaryRootWindow() == drag_source_root_;
   // GetPrimaryDisplay returns an object on stack, so copy the bounds
   // instead of using reference.
   const gfx::Rect primary_bounds =
-      Shell::GetScreen()->GetPrimaryDisplay().bounds();
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();
   const gfx::Rect secondary_bounds = ScreenUtil::GetSecondaryDisplay().bounds();
   DisplayLayout::Position position = Shell::GetInstance()
                                          ->display_manager()
                                          ->GetCurrentDisplayLayout()
                                          .position;
 
   int upper_shared_y = std::max(primary_bounds.y(), secondary_bounds.y());
   int lower_shared_y =
       std::min(primary_bounds.bottom(), secondary_bounds.bottom());
   int shared_height = lower_shared_y - upper_shared_y;
@@ skipping 49 matching lines @@
 void ExtendedMouseWarpController::GetSrcAndDstRootWindows(
     aura::Window** src_root,
     aura::Window** dst_root) {
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   *src_root = drag_source_root_ ? drag_source_root_
                                 : Shell::GetInstance()->GetPrimaryRootWindow();
   *dst_root = root_windows[0] == *src_root ? root_windows[1] : root_windows[0];
 }
 
 }  // namespace ash