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

ash/system/ime/tray_ime_chromeos.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/ime/tray_ime_chromeos.h"
 
 #include <vector>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 73 matching lines @@
     SetAccessibleName(label);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IMEDefaultView);
 };
 
 class IMEDetailedView : public TrayDetailsView, public ViewClickListener {
  public:
   IMEDetailedView(SystemTrayItem* owner,
-                  user::LoginStatus login,
+                  LoginStatus login,
                   bool show_keyboard_toggle)
       : TrayDetailsView(owner), login_(login) {
     SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     IMEInfoList list;
     delegate->GetAvailableIMEList(&list);
     IMEPropertyInfoList property_list;
     delegate->GetCurrentIMEProperties(&property_list);
     Update(list, property_list, show_keyboard_toggle);
   }
 
@@ skipping 14 matching lines @@
 
     if (show_keyboard_toggle) {
       if (list.size() > 1 || !property_list.empty())
         AddScrollSeparator();
       AppendKeyboardStatus();
     }
 
     bool userAddingRunning = ash::Shell::GetInstance()
                                  ->session_state_delegate()
                                  ->IsInSecondaryLoginScreen();
-    if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED &&
+    if (login_ != LoginStatus::NOT_LOGGED_IN && login_ != LoginStatus::LOCKED &&
         !userAddingRunning)
       AppendSettings();
     AppendHeaderEntry();
 
     Layout();
     SchedulePaint();
   }
 
  private:
   void AppendHeaderEntry() { CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this); }
@@ skipping 72 matching lines @@
         prop_find = property_map_.find(sender);
         if (prop_find != property_map_.end()) {
           const std::string key = prop_find->second;
           delegate->ActivateIMEProperty(key);
           GetWidget()->Close();
         }
       }
     }
   }
 
-  user::LoginStatus login_;
+  LoginStatus login_;
 
   std::map<views::View*, std::string> ime_map_;
   std::map<views::View*, std::string> property_map_;
   views::View* settings_;
   views::View* keyboard_status_;
 
   DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
 };
 
 }  // namespace tray
@@ skipping 71 matching lines @@
     return current.name;
   } else {
     // Display virtual keyboard status instead.
     int id = keyboard::IsKeyboardEnabled()
                  ? IDS_ASH_STATUS_TRAY_KEYBOARD_ENABLED
                  : IDS_ASH_STATUS_TRAY_KEYBOARD_DISABLED;
     return ui::ResourceBundle::GetSharedInstance().GetLocalizedString(id);
   }
 }
 
-views::View* TrayIME::CreateTrayView(user::LoginStatus status) {
+views::View* TrayIME::CreateTrayView(LoginStatus status) {
   CHECK(tray_label_ == NULL);
   tray_label_ = new TrayItemView(this);
   tray_label_->CreateLabel();
   SetupLabelForTray(tray_label_->label());
   // Hide IME tray when it is created, it will be updated when it is notified
   // of the IME refresh event.
   tray_label_->SetVisible(false);
   return tray_label_;
 }
 
-views::View* TrayIME::CreateDefaultView(user::LoginStatus status) {
+views::View* TrayIME::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == NULL);
   default_ =
       new tray::IMEDefaultView(this, GetDefaultViewLabel(ime_list_.size() > 1));
   default_->SetVisible(ShouldDefaultViewBeVisible());
   return default_;
 }
 
-views::View* TrayIME::CreateDetailedView(user::LoginStatus status) {
+views::View* TrayIME::CreateDetailedView(LoginStatus status) {
   CHECK(detailed_ == NULL);
   detailed_ =
       new tray::IMEDetailedView(this, status, ShouldShowKeyboardToggle());
   return detailed_;
 }
 
 void TrayIME::DestroyTrayView() {
   tray_label_ = NULL;
 }
 
 void TrayIME::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayIME::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
-void TrayIME::UpdateAfterLoginStatusChange(user::LoginStatus status) {
-}
+void TrayIME::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 void TrayIME::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   SetTrayLabelItemBorder(tray_label_, alignment);
   tray_label_->Layout();
 }
 
 void TrayIME::OnIMERefresh() {
   // Caches the current ime state.
   SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   ime_list_.clear();
@@ skipping 12 matching lines @@
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash