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

ash/display/cursor_window_controller.cc

 // Copyright 2014 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/cursor_window_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursors_aura.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/screen.h"
 
 namespace ash {
 
 class CursorWindowDelegate : public aura::WindowDelegate {
  public:
   CursorWindowDelegate() {}
   ~CursorWindowDelegate() override {}
 
   // aura::WindowDelegate overrides:
   gfx::Size GetMinimumSize() const override { return size_; }
@@ skipping 58 matching lines @@
   if (is_cursor_compositing_enabled_ != enabled) {
     is_cursor_compositing_enabled_ = enabled;
     if (display_.is_valid())
       UpdateCursorImage();
     UpdateContainer();
   }
 }
 
 void CursorWindowController::UpdateContainer() {
   if (is_cursor_compositing_enabled_) {
-    gfx::Screen* screen = Shell::GetScreen();
+    gfx::Screen* screen = gfx::Screen::GetScreen();
     gfx::Display display = screen->GetDisplayNearestPoint(
         screen->GetCursorScreenPoint());
     DCHECK(display.is_valid());
     if (display.is_valid())
       SetDisplay(display);
   } else {
     aura::Window* mirror_window = Shell::GetInstance()
                                       ->window_tree_host_manager()
                                       ->mirror_window_controller()
                                       ->GetWindow();
     if (mirror_window)
-      display_ = Shell::GetScreen()->GetPrimaryDisplay();
+      display_ = gfx::Screen::GetScreen()->GetPrimaryDisplay();
     SetContainer(mirror_window);
   }
   // Updates the hot point based on the current display.
   UpdateCursorImage();
 }
 
 void CursorWindowController::SetDisplay(const gfx::Display& display) {
   if (!is_cursor_compositing_enabled_)
     return;
 
@@ skipping 160 matching lines @@
     cursor_window_->Show();
   else
     cursor_window_->Hide();
 }
 
 const gfx::ImageSkia& CursorWindowController::GetCursorImageForTest() const {
   return delegate_->cursor_image();
 }
 
 }  // namespace ash