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

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 224 matching lines @@
 // static
 aura::Window* Shell::GetTargetRootWindow() {
   CHECK(HasInstance());
   Shell* shell = GetInstance();
   if (shell->scoped_target_root_window_)
     return shell->scoped_target_root_window_;
   return shell->target_root_window_;
 }
 
 // static
-gfx::Screen* Shell::GetScreen() {
-  return gfx::Screen::GetScreen();
-}
-
-// static
 aura::Window::Windows Shell::GetAllRootWindows() {
   CHECK(HasInstance());
   return Shell::GetInstance()->window_tree_host_manager()->GetAllRootWindows();
 }
 
 // static
 aura::Window* Shell::GetContainer(aura::Window* root_window,
                                   int container_id) {
   return root_window->GetChildById(container_id);
 }
@@ skipping 643 matching lines @@
   window_tree_host_manager_->CreatePrimaryHost(
       ShellInitParamsToAshWindowTreeHostInitParams(init_params));
   aura::Window* root_window = window_tree_host_manager_->GetPrimaryRootWindow();
   target_root_window_ = root_window;
 
 #if defined(OS_CHROMEOS)
   resolution_notification_controller_.reset(
       new ResolutionNotificationController);
 #endif
 
-  cursor_manager_.SetDisplay(GetScreen()->GetPrimaryDisplay());
+  cursor_manager_.SetDisplay(gfx::Screen::GetScreen()->GetPrimaryDisplay());
 
   nested_accelerator_controller_.reset(
       new ::wm::NestedAcceleratorController(new NestedAcceleratorDelegate));
   accelerator_controller_.reset(new AcceleratorController);
   maximize_mode_controller_.reset(new MaximizeModeController());
 
   AddPreTargetHandler(window_tree_host_manager_->input_method_event_handler());
 
 #if defined(OS_CHROMEOS)
   magnifier_key_scroll_handler_ = MagnifierKeyScroller::CreateHandler();
@@ skipping 246 matching lines @@
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash