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

chrome/browser/ui/webui/options/chromeos/display_options_handler.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 "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 271 matching lines @@
     const std::vector<gfx::Display>& displays) {
   ash::DisplayManager* display_manager = GetDisplayManager();
   ash::DisplayManager::MultiDisplayMode display_mode;
   if (display_manager->IsInMirrorMode())
     display_mode = ash::DisplayManager::MIRRORING;
   else if (display_manager->IsInUnifiedMode())
     display_mode = ash::DisplayManager::UNIFIED;
   else
     display_mode = ash::DisplayManager::EXTENDED;
   base::FundamentalValue mode(static_cast<int>(display_mode));
-  int64_t primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t primary_id = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();
   base::ListValue js_displays;
   for (const gfx::Display& display : displays) {
     const ash::DisplayInfo& display_info =
         display_manager->GetDisplayInfo(display.id());
     base::DictionaryValue* js_display = new base::DictionaryValue();
     js_display->SetString("id", base::Int64ToString(display.id()));
     js_display->SetString("name",
                           display_manager->GetDisplayNameForId(display.id()));
     base::DictionaryValue* display_bounds =
         ConvertBoundsToValue(display.bounds());
@@ skipping 195 matching lines @@
   bool enable = false;
   if (!args->GetBoolean(0, &enable))
     NOTREACHED();
 
   GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
       enable ? ash::DisplayManager::UNIFIED : ash::DisplayManager::EXTENDED);
 }
 
 }  // namespace options
 }  // namespace chromeos