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

ash/system/user/tray_user.cc

 // Copyright (c) 2012 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/user/tray_user.h"
 
 #include "ash/ash_switches.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 54 matching lines @@
   } else {
     return layout_view_->size();
   }
 }
 
 gfx::Rect TrayUser::GetUserPanelBoundsInScreenForTest() const {
   DCHECK(user_);
   return user_->GetBoundsInScreenOfUserButtonForTest();
 }
 
-void TrayUser::UpdateAfterLoginStatusChangeForTest(user::LoginStatus status) {
+void TrayUser::UpdateAfterLoginStatusChangeForTest(LoginStatus status) {
   UpdateAfterLoginStatusChange(status);
 }
 
-views::View* TrayUser::CreateTrayView(user::LoginStatus status) {
+views::View* TrayUser::CreateTrayView(LoginStatus status) {
   CHECK(layout_view_ == nullptr);
 
   layout_view_ = new views::View;
   layout_view_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal,
                            0, 0, kUserLabelToIconPadding));
   UpdateAfterLoginStatusChange(status);
   return layout_view_;
 }
 
-views::View* TrayUser::CreateDefaultView(user::LoginStatus status) {
-  if (status == user::LOGGED_IN_NONE)
+views::View* TrayUser::CreateDefaultView(LoginStatus status) {
+  if (status == LoginStatus::NOT_LOGGED_IN)
     return nullptr;
   const SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
 
   // If the screen is locked or a system modal dialog box is shown, show only
   // the currently active user.
   if (user_index_ && (session_state_delegate->IsUserSessionBlocked() ||
                       Shell::GetInstance()->IsSystemModalWindowOpen()))
     return nullptr;
 
@@ skipping 12 matching lines @@
 void TrayUser::DestroyTrayView() {
   layout_view_ = nullptr;
   avatar_ = nullptr;
   label_ = nullptr;
 }
 
 void TrayUser::DestroyDefaultView() {
   user_ = nullptr;
 }
 
-void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
+void TrayUser::UpdateAfterLoginStatusChange(LoginStatus status) {
   // Only the active user is represented in the tray.
   if (!layout_view_)
     return;
   if (user_index_ > 0)
     return;
   bool need_label = false;
   bool need_avatar = false;
   SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   if (delegate->IsUserSupervised())
     need_label =  true;
   switch (status) {
-    case user::LOGGED_IN_LOCKED:
-    case user::LOGGED_IN_USER:
-    case user::LOGGED_IN_OWNER:
-    case user::LOGGED_IN_PUBLIC:
+    case LoginStatus::LOCKED:
+    case LoginStatus::USER:
+    case LoginStatus::OWNER:
+    case LoginStatus::PUBLIC:
       need_avatar = true;
       break;
-    case user::LOGGED_IN_SUPERVISED:
+    case LoginStatus::SUPERVISED:
       need_avatar = true;
       need_label = true;
       break;
-    case user::LOGGED_IN_GUEST:
+    case LoginStatus::GUEST:
       need_label = true;
       break;
-    case user::LOGGED_IN_KIOSK_APP:
-    case user::LOGGED_IN_NONE:
+    case LoginStatus::KIOSK_APP:
+    case LoginStatus::NOT_LOGGED_IN:
       break;
   }
 
   if ((need_avatar != (avatar_ != nullptr)) ||
       (need_label != (label_ != nullptr))) {
     layout_view_->RemoveAllChildViews(true);
     if (need_label) {
       label_ = new views::Label;
       SetupLabelForTray(label_);
       layout_view_->AddChildView(label_);
     } else {
       label_ = nullptr;
     }
     if (need_avatar) {
       avatar_ = new tray::RoundedImageView(kTrayAvatarCornerRadius, true);
       layout_view_->AddChildView(avatar_);
     } else {
       avatar_ = nullptr;
     }
   }
 
   if (delegate->IsUserSupervised()) {
     label_->SetText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL));
-  } else if (status == user::LOGGED_IN_GUEST) {
+  } else if (status == LoginStatus::GUEST) {
     label_->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
   }
 
   if (avatar_) {
     avatar_->SetCornerRadii(
         0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius, 0);
     avatar_->SetBorder(views::Border::NullBorder());
   }
   UpdateAvatarImage(status);
 
@@ skipping 59 matching lines @@
     return;
 
   // Enforce a layout change that newly added items become visible.
   UpdateLayoutOfItem();
 
   // Update the user item.
   UpdateAvatarImage(
       Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus());
 }
 
-void TrayUser::UpdateAvatarImage(user::LoginStatus status) {
+void TrayUser::UpdateAvatarImage(LoginStatus status) {
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   if (!avatar_ ||
       user_index_ >= session_state_delegate->NumberOfLoggedInUsers())
     return;
 
   const user_manager::UserInfo* user_info =
       session_state_delegate->GetUserInfo(user_index_);
   CHECK(user_info);
   avatar_->SetImage(user_info->GetImage(),
                     gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
 }
 
 }  // namespace ash