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

Unified Diff: ash/wm/lock_state_controller.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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') | ash/wm/lock_state_controller_unittest.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 345a85a653274cdb34a58fdef7ccab09f6224986..82d49a1744060566b72bba8c1fb1ad599c6de35e 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -83,7 +83,7 @@ LockStateController::TestApi::~TestApi() {
LockStateController::LockStateController()
: animator_(new SessionStateAnimatorImpl()),
- login_status_(user::LOGGED_IN_NONE),
+ login_status_(LoginStatus::NOT_LOGGED_IN),
system_is_locked_(false),
shutting_down_(false),
shutdown_after_lock_(false),
@@ -225,14 +225,14 @@ void LockStateController::OnHostCloseRequested(
Shell::GetInstance()->delegate()->Exit();
}
-void LockStateController::OnLoginStateChanged(
- user::LoginStatus status) {
+void LockStateController::OnLoginStateChanged(LoginStatus status) {
// TODO(jdufault): Remove after resolving crbug.com/452599.
VLOG(0) << "LockStateController::OnLoginStateChanged login_status_: "
- << login_status_ << ", status: " << status;
- if (status != user::LOGGED_IN_LOCKED)
+ << static_cast<int>(login_status_)
+ << ", status: " << static_cast<int>(status);
+ if (status != LoginStatus::LOCKED)
login_status_ = status;
- system_is_locked_ = (status == user::LOGGED_IN_LOCKED);
+ system_is_locked_ = (status == LoginStatus::LOCKED);
}
void LockStateController::OnAppTerminating() {
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698