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

ash/system/chromeos/settings/tray_settings.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/chromeos/settings/tray_settings.h"
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/chromeos/power/power_status_view.h"
@@ skipping 13 matching lines @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 namespace tray {
 
 class SettingsDefaultView : public ActionableView,
                             public PowerStatus::Observer {
  public:
-  explicit SettingsDefaultView(user::LoginStatus status)
-      : login_status_(status),
-        label_(NULL),
-        power_status_view_(NULL) {
+  explicit SettingsDefaultView(LoginStatus status)
+      : login_status_(status), label_(NULL), power_status_view_(NULL) {
     PowerStatus::Get()->AddObserver(this);
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
         ash::kTrayPopupPaddingHorizontal, 0,
         ash::kTrayPopupPaddingBetweenItems));
 
     bool power_view_right_align = false;
     bool userAddingRunning = ash::Shell::GetInstance()
                                  ->session_state_delegate()
                                  ->IsInSecondaryLoginScreen();
 
-    if (login_status_ != user::LOGGED_IN_NONE &&
-        login_status_ != user::LOGGED_IN_LOCKED && !userAddingRunning) {
+    if (login_status_ != LoginStatus::NOT_LOGGED_IN &&
+        login_status_ != LoginStatus::LOCKED && !userAddingRunning) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       views::ImageView* icon =
           new ash::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
       icon->SetImage(
           rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToImageSkia());
       icon->set_id(test::kSettingsTrayItemViewId);
       AddChildView(icon);
 
       base::string16 text = rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_SETTINGS);
       label_ = new views::Label(text);
@@ skipping 11 matching lines @@
   }
 
   ~SettingsDefaultView() override { PowerStatus::Get()->RemoveObserver(this); }
 
   // Overridden from ash::ActionableView.
   bool PerformAction(const ui::Event& event) override {
     bool userAddingRunning = ash::Shell::GetInstance()
                                  ->session_state_delegate()
                                  ->IsInSecondaryLoginScreen();
 
-    if (login_status_ == user::LOGGED_IN_NONE ||
-        login_status_ == user::LOGGED_IN_LOCKED || userAddingRunning)
+    if (login_status_ == LoginStatus::NOT_LOGGED_IN ||
+        login_status_ == LoginStatus::LOCKED || userAddingRunning)
       return false;
 
     ash::Shell::GetInstance()->system_tray_delegate()->ShowSettings();
     return true;
   }
 
   // Overridden from views::View.
   void Layout() override {
     views::View::Layout();
 
@@ skipping 20 matching lines @@
       return;
 
     base::string16 accessible_name = label_ ?
         label_->text() + base::ASCIIToUTF16(", ") +
             PowerStatus::Get()->GetAccessibleNameString(true) :
         PowerStatus::Get()->GetAccessibleNameString(true);
     SetAccessibleName(accessible_name);
   }
 
  private:
-  user::LoginStatus login_status_;
+  LoginStatus login_status_;
   views::Label* label_;
   ash::PowerStatusView* power_status_view_;
 
   DISALLOW_COPY_AND_ASSIGN(SettingsDefaultView);
  };
 
 }  // namespace tray
 
 TraySettings::TraySettings(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       default_view_(NULL) {
 }
 
 TraySettings::~TraySettings() {
 }
 
-views::View* TraySettings::CreateTrayView(user::LoginStatus status) {
+views::View* TraySettings::CreateTrayView(LoginStatus status) {
   return NULL;
 }
 
-views::View* TraySettings::CreateDefaultView(user::LoginStatus status) {
-  if ((status == user::LOGGED_IN_NONE || status == user::LOGGED_IN_LOCKED) &&
+views::View* TraySettings::CreateDefaultView(LoginStatus status) {
+  if ((status == LoginStatus::NOT_LOGGED_IN || status == LoginStatus::LOCKED) &&
       !PowerStatus::Get()->IsBatteryPresent())
     return NULL;
   if (!ash::Shell::GetInstance()->system_tray_delegate()->ShouldShowSettings())
     return NULL;
   CHECK(default_view_ == NULL);
   default_view_ =  new tray::SettingsDefaultView(status);
   return default_view_;
 }
 
-views::View* TraySettings::CreateDetailedView(user::LoginStatus status) {
+views::View* TraySettings::CreateDetailedView(LoginStatus status) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void TraySettings::DestroyTrayView() {
 }
 
 void TraySettings::DestroyDefaultView() {
   default_view_ = NULL;
 }
 
 void TraySettings::DestroyDetailedView() {
 }
 
-void TraySettings::UpdateAfterLoginStatusChange(user::LoginStatus status) {
-}
+void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 }  // namespace ash