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

Unified Diff: ash/wm/lock_state_controller.cc

Issue 2797743002: ash: Merge LoginStatus update code path (Closed)
Patch Set: for #2 comments 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
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | chrome/browser/chromeos/power/login_lock_state_notifier.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/lock_state_controller.cc
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc
index dae6e253db8010f72543267a851f80104f5b0b9b..36f083b129ad0fb6cb6386dc69e291002075e431 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -66,7 +66,6 @@ const int LockStateController::kShutdownRequestDelayMs = 50;
LockStateController::LockStateController(
ShutdownController* shutdown_controller)
: animator_(new SessionStateAnimatorImpl()),
- login_status_(LoginStatus::NOT_LOGGED_IN),
system_is_locked_(false),
shutting_down_(false),
shutdown_after_lock_(false),
@@ -191,12 +190,6 @@ void LockStateController::OnHostCloseRequested(
Shell::Get()->shell_delegate()->Exit();
}
-void LockStateController::OnLoginStateChanged(LoginStatus status) {
- if (status != LoginStatus::LOCKED)
- login_status_ = status;
- system_is_locked_ = (status == LoginStatus::LOCKED);
-}
-
void LockStateController::OnAppTerminating() {
// If we hear that Chrome is exiting but didn't request it ourselves, all we
// can really hope for is that we'll have time to clear the screen.
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | chrome/browser/chromeos/power/login_lock_state_notifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698