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

ash/display/screen_position_controller.cc

 // Copyright (c) 2012 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/screen_position_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"
@@ skipping 105 matching lines @@
 #endif
   *target_root = root_window;
   *point = point_in_root;
 }
 
 void ScreenPositionController::ConvertPointToScreen(
     const aura::Window* window,
     gfx::Point* point) {
   const aura::Window* root = window->GetRootWindow();
   aura::Window::ConvertPointToTarget(window, root, point);
-  const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
-      const_cast<aura::Window*>(root)).bounds().origin();
+  const gfx::Point display_origin =
+      gfx::Screen::GetScreen()
+          ->GetDisplayNearestWindow(const_cast<aura::Window*>(root))
+          .bounds()
+          .origin();
   point->Offset(display_origin.x(), display_origin.y());
 }
 
 void ScreenPositionController::ConvertPointFromScreen(
     const aura::Window* window,
     gfx::Point* point) {
   const aura::Window* root = window->GetRootWindow();
-  const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
-      const_cast<aura::Window*>(root)).bounds().origin();
+  const gfx::Point display_origin =
+      gfx::Screen::GetScreen()
+          ->GetDisplayNearestWindow(const_cast<aura::Window*>(root))
+          .bounds()
+          .origin();
   point->Offset(-display_origin.x(), -display_origin.y());
   aura::Window::ConvertPointToTarget(root, window, point);
 }
 
 void ScreenPositionController::ConvertHostPointToScreen(
     aura::Window* root_window,
     gfx::Point* point) {
   aura::Window* root = root_window->GetRootWindow();
   aura::Window* target_root = nullptr;
   ConvertHostPointToRelativeToRootWindow(root, Shell::GetAllRootWindows(),
@@ skipping 68 matching lines @@
         activation_client->ActivateWindow(active);
       }
       // TODO(oshima): We should not have to update the bounds again
       // below in theory, but we currently do need as there is a code
       // that assumes that the bounds will never be overridden by the
       // layout mananger. We should have more explicit control how
       // constraints are applied by the layout manager.
     }
   }
   gfx::Point origin(bounds.origin());
-  const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
-      window).bounds().origin();
+  const gfx::Point display_origin = gfx::Screen::GetScreen()
+                                        ->GetDisplayNearestWindow(window)
+                                        .bounds()
+                                        .origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds.size()));
 }
 
 }  // namespace ash