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

Unified Diff: ash/metrics/user_metrics_recorder.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/common/login_status.h ('k') | ash/metrics/user_metrics_recorder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/metrics/user_metrics_recorder.cc
diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc
index 72ba25c50c7f38c7605f4fd586ab226d0f45c145..3e2873628c4e18042dbd14c12e0ba4d29e13ab5e 100644
--- a/ash/metrics/user_metrics_recorder.cc
+++ b/ash/metrics/user_metrics_recorder.cc
@@ -74,22 +74,22 @@ ActiveWindowStateType GetActiveWindowState() {
// Returns true if kiosk mode is active.
bool IsKioskModeActive() {
return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() ==
- user::LOGGED_IN_KIOSK_APP;
+ LoginStatus::KIOSK_APP;
}
// Returns true if there is an active user and their session isn't currently
// locked.
bool IsUserActive() {
switch (Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus()) {
- case user::LOGGED_IN_NONE:
- case user::LOGGED_IN_LOCKED:
+ case LoginStatus::NOT_LOGGED_IN:
+ case LoginStatus::LOCKED:
return false;
- case user::LOGGED_IN_USER:
- case user::LOGGED_IN_OWNER:
- case user::LOGGED_IN_GUEST:
- case user::LOGGED_IN_PUBLIC:
- case user::LOGGED_IN_SUPERVISED:
- case user::LOGGED_IN_KIOSK_APP:
+ case LoginStatus::USER:
+ case LoginStatus::OWNER:
+ case LoginStatus::GUEST:
+ case LoginStatus::PUBLIC:
+ case LoginStatus::SUPERVISED:
+ case LoginStatus::KIOSK_APP:
return true;
}
NOTREACHED();
« no previous file with comments | « ash/common/login_status.h ('k') | ash/metrics/user_metrics_recorder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698