| Index: ash/wm/lock_state_controller.h
|
| diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
|
| index ca166882555e514e4c42367d32aa0e33a9ee05fe..5db14eb2d5571a3c6a1cef9aeeb82d3eb40763f1 100644
|
| --- a/ash/wm/lock_state_controller.h
|
| +++ b/ash/wm/lock_state_controller.h
|
| @@ -200,12 +200,12 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
|
| void SetLockScreenDisplayedCallback(const base::Closure& callback);
|
|
|
| // aura::WindowTreeHostObserver override:
|
| - virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE;
|
| + virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
|
|
|
| // ShellObserver overrides:
|
| - virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;
|
| - virtual void OnAppTerminating() OVERRIDE;
|
| - virtual void OnLockStateChanged(bool locked) OVERRIDE;
|
| + virtual void OnLoginStateChanged(user::LoginStatus status) override;
|
| + virtual void OnAppTerminating() override;
|
| + virtual void OnLockStateChanged(bool locked) override;
|
|
|
| void set_animator_for_test(SessionStateAnimator* animator) {
|
| animator_.reset(animator);
|
|
|