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

ash/shelf/shelf_bezel_event_filter.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/shelf/shelf_bezel_event_filter.h"
 
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ui/aura/window.h"
+#include "ui/gfx/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 ShelfBezelEventFilter::ShelfBezelEventFilter(
     ShelfLayoutManager* shelf)
     : shelf_(shelf),
       in_touch_drag_(false) {
   Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
 ShelfBezelEventFilter::~ShelfBezelEventFilter() {
   Shell::GetInstance()->RemovePreTargetHandler(this);
 }
 
 void ShelfBezelEventFilter::OnGestureEvent(
     ui::GestureEvent* event) {
   gfx::Point point_in_screen(event->location());
   aura::Window* target = static_cast<aura::Window*>(event->target());
   ::wm::ConvertPointToScreen(target, &point_in_screen);
-  gfx::Rect screen =
-      Shell::GetScreen()->GetDisplayNearestPoint(point_in_screen).bounds();
+  gfx::Rect screen = gfx::Screen::GetScreen()
+                         ->GetDisplayNearestPoint(point_in_screen)
+                         .bounds();
   if ((!screen.Contains(point_in_screen) &&
        IsShelfOnBezel(screen, point_in_screen)) ||
       in_touch_drag_) {
     if (gesture_handler_.ProcessGestureEvent(*event, target)) {
       switch (event->type()) {
         case ui::ET_GESTURE_SCROLL_BEGIN:
           in_touch_drag_ = true;
           break;
         case ui::ET_GESTURE_SCROLL_END:
         case ui::ET_SCROLL_FLING_START:
@@ skipping 25 matching lines @@
       break;
     case SHELF_ALIGNMENT_RIGHT:
       if (point.x() >= screen.right())
         return true;
       break;
   }
   return false;
 }
 
 }  // namespace ash