Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4030)

Unified Diff: ash/wm/lock_state_controller.h

Issue 2797743002: ash: Merge LoginStatus update code path (Closed)
Patch Set: fix post unlock animation not run, and tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/lock_state_controller.h
diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
index 00b49e81cf63c0ffef4b24cb9d75ce5311a34d4f..96b15cc1987c8199a145487a8f329ed8cf3705fd 100644
--- a/ash/wm/lock_state_controller.h
+++ b/ash/wm/lock_state_controller.h
@@ -122,7 +122,6 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
// ShellObserver overrides:
- void OnLoginStateChanged(LoginStatus status) override;
void OnAppTerminating() override;
void OnLockStateChanged(bool locked) override;
@@ -199,9 +198,6 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
std::unique_ptr<SessionStateAnimator> animator_;
- // The current login status, or original login status from before we locked.
- LoginStatus login_status_;
-
// Current lock status.
bool system_is_locked_;

Powered by Google App Engine
This is Rietveld 408576698