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

Unified Diff: ash/system/chromeos/supervised/tray_supervised_user.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
Index: ash/system/chromeos/supervised/tray_supervised_user.cc
diff --git a/ash/system/chromeos/supervised/tray_supervised_user.cc b/ash/system/chromeos/supervised/tray_supervised_user.cc
index 4a835ae5d1aab0751b5a66da56923364ea61f0cf..5625e75920aa08709a50bc9dd2f54022926b0825 100644
--- a/ash/system/chromeos/supervised/tray_supervised_user.cc
+++ b/ash/system/chromeos/supervised/tray_supervised_user.cc
@@ -31,7 +31,7 @@ const char TraySupervisedUser::kNotificationId[] =
TraySupervisedUser::TraySupervisedUser(SystemTray* system_tray)
: SystemTrayItem(system_tray),
tray_view_(NULL),
- status_(ash::user::LOGGED_IN_NONE),
+ status_(LoginStatus::NOT_LOGGED_IN),
is_user_supervised_(false) {
Shell::GetInstance()->system_tray_delegate()->
AddCustodianInfoTrayObserver(this);
@@ -55,8 +55,7 @@ void TraySupervisedUser::UpdateMessage() {
CreateOrUpdateNotification(message);
}
-views::View* TraySupervisedUser::CreateDefaultView(
- user::LoginStatus status) {
+views::View* TraySupervisedUser::CreateDefaultView(LoginStatus status) {
CHECK(tray_view_ == NULL);
SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
if (!delegate->IsUserSupervised())
@@ -75,17 +74,15 @@ void TraySupervisedUser::OnViewClicked(views::View* sender) {
Shell::GetInstance()->system_tray_delegate()->ShowSupervisedUserInfo();
}
-void TraySupervisedUser::UpdateAfterLoginStatusChange(
- user::LoginStatus status) {
+void TraySupervisedUser::UpdateAfterLoginStatusChange(LoginStatus status) {
SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
bool is_user_supervised = delegate->IsUserSupervised();
if (status == status_ && is_user_supervised == is_user_supervised_)
return;
- if (is_user_supervised &&
- !delegate->IsUserChild() &&
- status_ != ash::user::LOGGED_IN_LOCKED &&
+ if (is_user_supervised && !delegate->IsUserChild() &&
+ status_ != LoginStatus::LOCKED &&
!delegate->GetSupervisedUserManager().empty())
CreateOrUpdateSupervisedWarningNotification();
« no previous file with comments | « ash/system/chromeos/supervised/tray_supervised_user.h ('k') | ash/system/chromeos/supervised/tray_supervised_user_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698