| Index: ash/wm/lock_state_controller.h
|
| diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
|
| index fcd26a83f6275e80f0d3c1b83ffb2907343e69bf..f681127ecc882d329ebf6de294180320c2375cf7 100644
|
| --- a/ash/wm/lock_state_controller.h
|
| +++ b/ash/wm/lock_state_controller.h
|
| @@ -41,12 +41,6 @@ class ASH_EXPORT LockStateControllerDelegate {
|
| LockStateControllerDelegate() {}
|
| virtual ~LockStateControllerDelegate() {}
|
|
|
| - // Returns true if the lock screen webpage instance is loading.
|
| - // TODO(jdufault): Remove this method once crbug.com/452599 is resolved. We
|
| - // proxy the IsLoading method call into this delegate because ash forbids all
|
| - // icnludes from content/.
|
| - virtual bool IsLoading() const = 0;
|
| -
|
| virtual void RequestLockScreen() = 0;
|
| virtual void RequestShutdown() = 0;
|
|
|
| @@ -320,8 +314,6 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
|
| // Started when we request that the screen be locked. When it fires, we
|
| // assume that our request got dropped.
|
| base::OneShotTimer lock_fail_timer_;
|
| - // TODO(jdufault): Remove after resolving crbug.com/452599.
|
| - bool lock_fail_timer_is_stopped_;
|
|
|
| // Started when the screen is locked while the power button is held. Adds a
|
| // delay between the appearance of the lock screen and the beginning of the
|
|
|