Index: chrome/browser/chromeos/login/lock/webui_screen_locker.cc |
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc |
index f238ca80dec2d446dbf1026ccb48ecc0de6072aa..43b7ba5482b8ca7f1e7289b5dc5a2389a0083941 100644 |
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc |
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/chromeos/login/lock/webui_screen_locker.h" |
+#include "ash/common/shell_delegate.h" |
+#include "ash/common/wm_shell.h" |
#include "ash/shell.h" |
#include "ash/system/chromeos/power/power_event_observer.h" |
#include "ash/wm/lock_state_controller.h" |
@@ -67,7 +69,7 @@ WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker) |
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::WmShell::Get()->delegate()->AddVirtualKeyboardStateObserver(this); |
display::Screen::GetScreen()->AddObserver(this); |
DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this); |
@@ -165,11 +167,9 @@ void WebUIScreenLocker::ResetAndFocusUserPod() { |
WebUIScreenLocker::~WebUIScreenLocker() { |
DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this); |
display::Screen::GetScreen()->RemoveObserver(this); |
- ash::Shell::GetInstance()-> |
- lock_state_controller()->RemoveObserver(this); |
+ ash::Shell::GetInstance()->lock_state_controller()->RemoveObserver(this); |
- ash::Shell::GetInstance()->delegate()-> |
- RemoveVirtualKeyboardStateObserver(this); |
+ ash::WmShell::Get()->delegate()->RemoveVirtualKeyboardStateObserver(this); |
// In case of shutdown, lock_window_ may be deleted before WebUIScreenLocker. |
if (lock_window_) { |
lock_window_->RemoveObserver(this); |