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

ash/system/user/user_card_view.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/user/user_card_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 314 matching lines @@
   const int line_height = font_list.GetHeight();
   const int link_extra_height = std::max(
       link_size.height() - learn_more_->GetInsets().top() - line_height, 0);
   preferred_size_ =
       gfx::Size(min_width + insets.width(),
                 line_count * line_height + link_extra_height + insets.height());
 }
 
 }  // namespace
 
-UserCardView::UserCardView(user::LoginStatus login_status,
+UserCardView::UserCardView(LoginStatus login_status,
                            int max_width,
                            int user_index) {
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kTrayPopupPaddingBetweenItems));
-  if (login_status == user::LOGGED_IN_PUBLIC) {
+  if (login_status == LoginStatus::PUBLIC) {
     AddPublicModeUserContent(max_width);
   } else {
     AddUserContent(login_status, user_index);
   }
 }
 
 UserCardView::~UserCardView() {}
 
 void UserCardView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_STATIC_TEXT;
   std::vector<base::string16> labels;
   for (int i = 0; i < child_count(); ++i)
     GetAccessibleLabelFromDescendantViews(child_at(i), labels);
   state->name = base::JoinString(labels, base::ASCIIToUTF16(" "));
 }
 
 void UserCardView::AddPublicModeUserContent(int max_width) {
-  views::View* icon = CreateIcon(user::LOGGED_IN_PUBLIC, 0);
+  views::View* icon = CreateIcon(LoginStatus::PUBLIC, 0);
   AddChildView(icon);
   int details_max_width = max_width - icon->GetPreferredSize().width() -
                           kTrayPopupPaddingBetweenItems;
   AddChildView(new PublicAccountUserDetails(details_max_width));
 }
 
-void UserCardView::AddUserContent(user::LoginStatus login_status,
-                                  int user_index) {
+void UserCardView::AddUserContent(LoginStatus login_status, int user_index) {
   views::View* icon = CreateIcon(login_status, user_index);
   AddChildView(icon);
   views::Label* user_name = NULL;
   SessionStateDelegate* delegate =
       Shell::GetInstance()->session_state_delegate();
   if (!user_index) {
     base::string16 user_name_string =
-        login_status == user::LOGGED_IN_GUEST
+        login_status == LoginStatus::GUEST
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL)
             : delegate->GetUserInfo(user_index)->GetDisplayName();
     if (!user_name_string.empty()) {
       user_name = new views::Label(user_name_string);
       user_name->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     }
   }
 
   views::Label* user_email = NULL;
-  if (login_status != user::LOGGED_IN_GUEST) {
+  if (login_status != LoginStatus::GUEST) {
     SystemTrayDelegate* tray_delegate =
         Shell::GetInstance()->system_tray_delegate();
     base::string16 user_email_string =
         tray_delegate->IsUserSupervised()
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
             : base::UTF8ToUTF16(delegate->GetUserInfo(user_index)->GetEmail());
     if (!user_email_string.empty()) {
       user_email = new views::Label(user_email_string);
       user_email->SetFontList(
           ui::ResourceBundle::GetSharedInstance().GetFontList(
@@ skipping 39 matching lines @@
       details->AddChildView(email_indicator_view);
       details->AddChildView(media_indicator->GetMessageView());
       AddChildView(details);
 #else
       AddChildView(user_email);
 #endif
     }
   }
 }
 
-views::View* UserCardView::CreateIcon(user::LoginStatus login_status,
+views::View* UserCardView::CreateIcon(LoginStatus login_status,
                                       int user_index) {
   RoundedImageView* icon =
       new RoundedImageView(kTrayAvatarCornerRadius, user_index == 0);
-  if (login_status == user::LOGGED_IN_GUEST) {
+  if (login_status == LoginStatus::GUEST) {
     icon->SetImage(*ui::ResourceBundle::GetSharedInstance()
                         .GetImageNamed(IDR_AURA_UBER_TRAY_GUEST_ICON)
                         .ToImageSkia(),
                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
   } else {
     SessionStateDelegate* delegate =
         Shell::GetInstance()->session_state_delegate();
     icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(),
                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
   }
   return icon;
 }
 
 }  // namespace tray
 }  // namespace ash