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

chrome/browser/chromeos/login/lock/webui_screen_locker.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 "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/power/power_event_observer.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/lock_state_observer.h"
@@ skipping 52 matching lines @@
 WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
     : ScreenLockerDelegate(screen_locker),
       lock_ready_(false),
       webui_ready_(false),
       network_state_helper_(new login::NetworkStateHelper),
       is_observing_keyboard_(false),
       weak_factory_(this) {
   set_should_emit_login_prompt_visible(false);
   ash::Shell::GetInstance()->lock_state_controller()->AddObserver(this);
   ash::Shell::GetInstance()->delegate()->AddVirtualKeyboardStateObserver(this);
-  ash::Shell::GetScreen()->AddObserver(this);
+  gfx::Screen::GetScreen()->AddObserver(this);
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 
   if (keyboard::KeyboardController::GetInstance()) {
     keyboard::KeyboardController::GetInstance()->AddObserver(this);
     is_observing_keyboard_ = true;
   }
 }
 
 void WebUIScreenLocker::LockScreen() {
   gfx::Rect bounds = gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();
@@ skipping 73 matching lines @@
 
 void WebUIScreenLocker::ResetAndFocusUserPod() {
   if (!webui_ready_)
     return;
   GetWebUI()->CallJavascriptFunction("cr.ui.Oobe.clearUserPodPassword");
   FocusUserPod();
 }
 
 WebUIScreenLocker::~WebUIScreenLocker() {
   DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
-  ash::Shell::GetScreen()->RemoveObserver(this);
+  gfx::Screen::GetScreen()->RemoveObserver(this);
   ash::Shell::GetInstance()->
       lock_state_controller()->RemoveObserver(this);
 
   ash::Shell::GetInstance()->delegate()->
       RemoveVirtualKeyboardStateObserver(this);
   // In case of shutdown, lock_window_ may be deleted before WebUIScreenLocker.
   if (lock_window_) {
     lock_window_->RemoveObserver(this);
     lock_window_->Close();
   }
@@ skipping 224 matching lines @@
   }
 
   if (GetOobeUI()) {
     const gfx::Size& size = primary_display.size();
     GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(),
                                                        size.height());
   }
 }
 
 }  // namespace chromeos