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

ash/system/user/user_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_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 164 matching lines @@
 
   // Add the command text.
   views::Label* command_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
   command_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   add_user_->AddChildView(command_label);
 }
 
 }  // namespace
 
-UserView::UserView(SystemTrayItem* owner,
-                   user::LoginStatus login,
-                   UserIndex index)
+UserView::UserView(SystemTrayItem* owner, LoginStatus login, UserIndex index)
     : user_index_(index),
       user_card_view_(NULL),
       owner_(owner),
       is_user_card_button_(false),
       logout_button_(NULL),
       add_user_enabled_(true),
       focus_manager_(NULL) {
-  CHECK_NE(user::LOGGED_IN_NONE, login);
+  CHECK_NE(LoginStatus::NOT_LOGGED_IN, login);
   if (!index) {
     // Only the logged in user will have a background. All other users will have
     // to allow the TrayPopupContainer highlighting the menu line.
     set_background(views::Background::CreateSolidBackground(
-        login == user::LOGGED_IN_PUBLIC ? kPublicAccountBackgroundColor
-                                        : kBackgroundColor));
+        login == LoginStatus::PUBLIC ? kPublicAccountBackgroundColor
+                                     : kBackgroundColor));
   }
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kTrayPopupPaddingBetweenItems));
   // The logout button must be added before the user card so that the user card
   // can correctly calculate the remaining available width.
   // Note that only the current multiprofile user gets a button.
   if (!user_index_)
     AddLogoutButton(login);
   AddUserCard(login);
 }
@@ skipping 114 matching lines @@
 
 void UserView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   if (focused_now)
     RemoveAddUserMenuOption();
 }
 
 void UserView::OnDidChangeFocus(View* focused_before, View* focused_now) {
   // Nothing to do here.
 }
 
-void UserView::AddLogoutButton(user::LoginStatus login) {
+void UserView::AddLogoutButton(LoginStatus login) {
   const base::string16 title =
       user::GetLocalizedSignOutStringForStatus(login, true);
   auto* logout_button = new TrayPopupLabelButton(this, title);
   logout_button->SetAccessibleName(title);
   logout_button_ = logout_button;
   // In public account mode, the logout button border has a custom color.
-  if (login == user::LOGGED_IN_PUBLIC) {
+  if (login == LoginStatus::PUBLIC) {
     std::unique_ptr<TrayPopupLabelButtonBorder> border(
         new TrayPopupLabelButtonBorder());
     border->SetPainter(false,
                        views::Button::STATE_NORMAL,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesNormal));
     border->SetPainter(false,
                        views::Button::STATE_HOVERED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
     border->SetPainter(false,
                        views::Button::STATE_PRESSED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
     logout_button_->SetBorder(std::move(border));
   }
   AddChildView(logout_button_);
 }
 
-void UserView::AddUserCard(user::LoginStatus login) {
+void UserView::AddUserCard(LoginStatus login) {
   // Add padding around the panel.
   SetBorder(views::Border::CreateEmptyBorder(kTrayPopupUserCardVerticalPadding,
                                              kTrayPopupPaddingHorizontal,
                                              kTrayPopupUserCardVerticalPadding,
                                              kTrayPopupPaddingHorizontal));
 
   views::TrayBubbleView* bubble_view =
       owner_->system_tray()->GetSystemBubble()->bubble_view();
   int max_card_width =
       bubble_view->GetMaximumSize().width() -
@@ skipping 33 matching lines @@
       insets = gfx::Insets(1, 1, 1, 3);
     }
     auto* button =
         new ButtonFromView(contents_view, this, !user_index_, insets);
     user_card_view_ = button;
     is_user_card_button_ = true;
   }
   AddChildViewAt(user_card_view_, 0);
   // Card for supervised user can consume more space than currently
   // available. In that case we should increase system bubble's width.
-  if (login == user::LOGGED_IN_PUBLIC)
+  if (login == LoginStatus::PUBLIC)
     bubble_view->SetWidth(GetPreferredSize().width());
 }
 
 void UserView::ToggleAddUserMenuOption() {
   if (add_menu_option_.get()) {
     RemoveAddUserMenuOption();
     return;
   }
 
   // Note: We do not need to install a global event handler to delete this
@@ skipping 97 matching lines @@
   focus_manager_ = NULL;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
   popup_message_.reset();
   mouse_watcher_.reset();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash