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 24 matching lines @@
 
 // Helper method that maps a gfx::Display to an aura::Window.
 aura::Window* GetRootWindowForDisplayId(int64_t display_id) {
   return Shell::GetInstance()
       ->window_tree_host_manager()
       ->GetRootWindowForDisplayId(display_id);
 }
 
 // Helper method that maps an aura::Window to a gfx::Display.
 gfx::Display GetDisplayFromWindow(aura::Window* window) {
-  return Shell::GetScreen()->GetDisplayNearestWindow(window);
+  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(window);
 }
 
 }  // namespace
 
 ExtendedMouseWarpController::WarpRegion::WarpRegion(
     int64_t a_display_id,
     int64_t b_display_id,
     const gfx::Rect& a_indicator_bounds,
     const gfx::Rect& b_indicator_bounds)
     : a_display_id_(a_display_id),
@@ skipping 31 matching lines @@
       const gfx::Display& right = display_manager->GetDisplayAt(i);
 
       AddWarpRegion(CreateVerticalEdgeBounds(left, right, DisplayLayout::RIGHT),
                     drag_source != nullptr);
     }
   } else {
     // Make sure to set |a| as the primary display, and |b| as the secondary
     // display. DisplayLayout::Position is defined in terms of primary.
     DisplayLayout::Position position =
         display_manager->GetCurrentDisplayLayout().position;
-    const gfx::Display& a = Shell::GetScreen()->GetPrimaryDisplay();
+    const gfx::Display& a = gfx::Screen::GetScreen()->GetPrimaryDisplay();
     const gfx::Display& b = ScreenUtil::GetSecondaryDisplay();
 
     // TODO(oshima): Use ComputeBondary instead.
     if (position == DisplayLayout::TOP || position == DisplayLayout::BOTTOM) {
       AddWarpRegion(CreateHorizontalEdgeBounds(a, b, position),
                     drag_source != nullptr);
     } else {
       AddWarpRegion(CreateVerticalEdgeBounds(a, b, position),
                     drag_source != nullptr);
     }
   }
 }
 
 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 144 matching lines @@
     upper_indicator_y = std::max(upper_indicator_y, upper_shared_y);
   }
   a_indicator_bounds.set_y(upper_indicator_y);
   a_indicator_bounds.set_height(lower_indicator_y - upper_indicator_y);
 
   return make_scoped_ptr(
       new WarpRegion(a.id(), b.id(), a_indicator_bounds, b_indicator_bounds));
 }
 
 }  // namespace ash