Moves ash::user::LoginStatus to ash/common

ash/system/chromeos/supervised/tray_supervised_user.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/supervised/tray_supervised_user.h"
 
 #include <utility>
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/label_tray_view.h"
@@ skipping 13 matching lines @@
 using message_center::Notification;
 
 namespace ash {
 
 const char TraySupervisedUser::kNotificationId[] =
     "chrome://user/locally-managed";
 
 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);
 }
 
 TraySupervisedUser::~TraySupervisedUser() {
   // We need the check as on shell destruction delegate is destroyed first.
   SystemTrayDelegate* system_tray_delegate =
       Shell::GetInstance()->system_tray_delegate();
   if (system_tray_delegate)
     system_tray_delegate->RemoveCustodianInfoTrayObserver(this);
 }
 
 void TraySupervisedUser::UpdateMessage() {
   base::string16 message = Shell::GetInstance()->system_tray_delegate()->
       GetSupervisedUserMessage();
   if (tray_view_)
     tray_view_->SetMessage(message);
   if (message_center::MessageCenter::Get()->FindVisibleNotificationById(
       kNotificationId))
     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())
     return NULL;
 
   tray_view_ = new LabelTrayView(this, GetSupervisedUserIconId());
   UpdateMessage();
   return tray_view_;
 }
 
 void TraySupervisedUser::DestroyDefaultView() {
   tray_view_ = NULL;
 }
 
 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();
 
   status_ = status;
   is_user_supervised_ = is_user_supervised;
 }
 
 void TraySupervisedUser::CreateOrUpdateNotification(
     const base::string16& new_message) {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
@@ skipping 30 matching lines @@
 
   // Not intended to be used for non-supervised users.
   CHECK(delegate->IsUserSupervised());
 
   if (delegate->IsUserChild())
     return IDR_AURA_UBER_TRAY_CHILD_USER;
   return IDR_AURA_UBER_TRAY_SUPERVISED_USER;
 }
 
 }  // namespace ash