| Index: chrome/browser/chromeos/login/webui_screen_locker.h
|
| diff --git a/chrome/browser/chromeos/login/webui_screen_locker.h b/chrome/browser/chromeos/login/webui_screen_locker.h
|
| index 10346871d48c21633ca9b408dab76b2e500b53e6..b71e0da78cc173c0383915491c98bf93c7108739 100644
|
| --- a/chrome/browser/chromeos/login/webui_screen_locker.h
|
| +++ b/chrome/browser/chromeos/login/webui_screen_locker.h
|
| @@ -7,7 +7,7 @@
|
|
|
| #include <string>
|
|
|
| -#include "ash/wm/session_state_observer.h"
|
| +#include "ash/wm/session_lock_state_observer.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -43,7 +43,7 @@ class WebUIScreenLocker : public WebUILoginView,
|
| public LoginDisplay::Delegate,
|
| public ScreenLockerDelegate,
|
| public LockWindow::Observer,
|
| - public ash::SessionStateObserver,
|
| + public ash::SessionLockStateObserver,
|
| public views::WidgetObserver,
|
| public PowerManagerClient::Observer,
|
| public content::WebContentsObserver {
|
| @@ -92,9 +92,9 @@ class WebUIScreenLocker : public WebUILoginView,
|
| // LockWindow::Observer implementation.
|
| virtual void OnLockWindowReady() OVERRIDE;
|
|
|
| - // SessionStateObserver override.
|
| - virtual void OnSessionStateEvent(ash::SessionStateObserver::EventType event)
|
| - OVERRIDE;
|
| + // SessionLockStateObserver override.
|
| + virtual void OnSessionLockStateEvent(
|
| + ash::SessionLockStateObserver::EventType event) OVERRIDE;
|
|
|
| // WidgetObserver override.
|
| virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
|
|
|