| Index: ash/wm/lock_state_controller.h
|
| diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
|
| index 5db14eb2d5571a3c6a1cef9aeeb82d3eb40763f1..73199bf6a802f89cd458a44911a6fe602cd3bdbc 100644
|
| --- a/ash/wm/lock_state_controller.h
|
| +++ b/ash/wm/lock_state_controller.h
|
| @@ -143,7 +143,7 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
|
| };
|
|
|
| LockStateController();
|
| - virtual ~LockStateController();
|
| + ~LockStateController() override;
|
|
|
| void SetDelegate(scoped_ptr<LockStateControllerDelegate> delegate);
|
|
|
| @@ -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;
|
| + 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;
|
| + void OnLoginStateChanged(user::LoginStatus status) override;
|
| + void OnAppTerminating() override;
|
| + void OnLockStateChanged(bool locked) override;
|
|
|
| void set_animator_for_test(SessionStateAnimator* animator) {
|
| animator_.reset(animator);
|
|
|