| Index: chrome/browser/chromeos/login/lock/webui_screen_locker.h
|
| diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
|
| index fea1b725af96e579d7257b4e04397ee1cf7f67f2..b8b871808d22dc1fce16ab3f60df5597a7864619 100644
|
| --- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h
|
| +++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
|
| @@ -10,7 +10,6 @@
|
| #include <memory>
|
| #include <string>
|
|
|
| -#include "ash/wm/lock_state_observer.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| @@ -45,7 +44,6 @@ class WebUIScreenLockerTester;
|
| // Displays a WebUI lock screen based on the Oobe account picker screen.
|
| class WebUIScreenLocker : public WebUILoginView,
|
| public LoginDisplay::Delegate,
|
| - public ash::LockStateObserver,
|
| public views::WidgetObserver,
|
| public PowerManagerClient::Observer,
|
| public display::DisplayObserver,
|
| @@ -88,6 +86,9 @@ class WebUIScreenLocker : public WebUILoginView,
|
| // Called when the webui header bar becomes visible.
|
| void OnHeaderBarVisible();
|
|
|
| + // Called by ScreenLocker to notify that ash lock animation finishes.
|
| + void OnLockAnimationFinished();
|
| +
|
| private:
|
| friend class test::WebUIScreenLockerTester;
|
|
|
| @@ -119,9 +120,6 @@ class WebUIScreenLocker : public WebUILoginView,
|
| void Signout() override;
|
| bool IsUserWhitelisted(const AccountId& account_id) override;
|
|
|
| - // LockStateObserver:
|
| - void OnLockStateEvent(ash::LockStateObserver::EventType event) override;
|
| -
|
| // WidgetObserver:
|
| void OnWidgetDestroying(views::Widget* widget) override;
|
|
|
|
|