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

ash/system/tray_accessibility.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/tray_accessibility.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 44 matching lines @@
     state |= A11Y_LARGE_CURSOR;
   if (delegate->IsAutoclickEnabled())
     state |= A11Y_AUTOCLICK;
   if (delegate->IsVirtualKeyboardEnabled())
     state |= A11Y_VIRTUAL_KEYBOARD;
   if (delegate->IsBrailleDisplayConnected())
     state |= A11Y_BRAILLE_DISPLAY_CONNECTED;
   return state;
 }
 
-user::LoginStatus GetCurrentLoginStatus() {
+LoginStatus GetCurrentLoginStatus() {
   return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
 }
 
 }  // namespace
 
 namespace tray {
 
 class DefaultAccessibilityView : public TrayItemMore {
  public:
   explicit DefaultAccessibilityView(SystemTrayItem* owner)
@@ skipping 40 matching lines @@
   }
   views::Label* label = new views::Label(text);
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   return label;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::tray::AccessibilityDetailedView
 
-AccessibilityDetailedView::AccessibilityDetailedView(
-    SystemTrayItem* owner, user::LoginStatus login) :
-        TrayDetailsView(owner),
-        spoken_feedback_view_(NULL),
-        high_contrast_view_(NULL),
-        screen_magnifier_view_(NULL),
-        large_cursor_view_(NULL),
-        help_view_(NULL),
-        settings_view_(NULL),
-        autoclick_view_(NULL),
-        virtual_keyboard_view_(NULL),
-        spoken_feedback_enabled_(false),
-        high_contrast_enabled_(false),
-        screen_magnifier_enabled_(false),
-        large_cursor_enabled_(false),
-        autoclick_enabled_(false),
-        virtual_keyboard_enabled_(false),
-        login_(login) {
-
+AccessibilityDetailedView::AccessibilityDetailedView(SystemTrayItem* owner,
+                                                     LoginStatus login)
+    : TrayDetailsView(owner),
+      spoken_feedback_view_(nullptr),
+      high_contrast_view_(nullptr),
+      screen_magnifier_view_(nullptr),
+      large_cursor_view_(nullptr),
+      help_view_(nullptr),
+      settings_view_(nullptr),
+      autoclick_view_(nullptr),
+      virtual_keyboard_view_(nullptr),
+      spoken_feedback_enabled_(false),
+      high_contrast_enabled_(false),
+      screen_magnifier_enabled_(false),
+      large_cursor_enabled_(false),
+      autoclick_enabled_(false),
+      virtual_keyboard_enabled_(false),
+      login_(login) {
   Reset();
 
   AppendAccessibilityList();
   AppendHelpEntries();
   CreateSpecialRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE, this);
 
   Layout();
 }
 
 void AccessibilityDetailedView::AppendAccessibilityList() {
   CreateScrollableList();
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
   AccessibilityDelegate* delegate =
       Shell::GetInstance()->accessibility_delegate();
   spoken_feedback_enabled_ = delegate->IsSpokenFeedbackEnabled();
   spoken_feedback_view_ =
       AddScrollListItem(bundle.GetLocalizedString(
                             IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK),
                         spoken_feedback_enabled_, spoken_feedback_enabled_);
 
   // Large Cursor item is shown only in Login screen.
-  if (login_ == user::LOGGED_IN_NONE) {
+  if (login_ == LoginStatus::NOT_LOGGED_IN) {
     large_cursor_enabled_ = delegate->IsLargeCursorEnabled();
     large_cursor_view_ =
         AddScrollListItem(bundle.GetLocalizedString(
                               IDS_ASH_STATUS_TRAY_ACCESSIBILITY_LARGE_CURSOR),
                           large_cursor_enabled_, large_cursor_enabled_);
   }
 
   high_contrast_enabled_ = delegate->IsHighContrastEnabled();
   high_contrast_view_ = AddScrollListItem(
       bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_HIGH_CONTRAST_MODE),
       high_contrast_enabled_, high_contrast_enabled_);
   screen_magnifier_enabled_ = delegate->IsMagnifierEnabled();
   screen_magnifier_view_ =
       AddScrollListItem(bundle.GetLocalizedString(
                             IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SCREEN_MAGNIFIER),
                         screen_magnifier_enabled_, screen_magnifier_enabled_);
 
   // Don't show autoclick option at login screen.
-  if (login_ != user::LOGGED_IN_NONE) {
+  if (login_ != LoginStatus::NOT_LOGGED_IN) {
     autoclick_enabled_ = delegate->IsAutoclickEnabled();
     autoclick_view_ = AddScrollListItem(
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_AUTOCLICK),
         autoclick_enabled_, autoclick_enabled_);
   }
 
   virtual_keyboard_enabled_ = delegate->IsVirtualKeyboardEnabled();
   virtual_keyboard_view_ =
       AddScrollListItem(bundle.GetLocalizedString(
                             IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD),
                         virtual_keyboard_enabled_, virtual_keyboard_enabled_);
 }
 
 void AccessibilityDetailedView::AppendHelpEntries() {
   // Currently the help page requires a browser window.
   // TODO(yoshiki): show this even on login/lock screen. crbug.com/158286
   bool userAddingRunning = ash::Shell::GetInstance()
                                ->session_state_delegate()
                                ->IsInSecondaryLoginScreen();
 
-  if (login_ == user::LOGGED_IN_NONE ||
-      login_ == user::LOGGED_IN_LOCKED || userAddingRunning)
+  if (login_ == LoginStatus::NOT_LOGGED_IN || login_ == LoginStatus::LOCKED ||
+      userAddingRunning)
     return;
 
   views::View* bottom_row = new View();
   views::BoxLayout* layout = new
       views::BoxLayout(views::BoxLayout::kHorizontal,
                        kTrayMenuBottomRowPadding,
                        kTrayMenuBottomRowPadding,
                        kTrayMenuBottomRowPaddingBetweenItems);
   layout->SetDefaultFlex(1);
   bottom_row->SetLayoutManager(layout);
@@ skipping 115 matching lines @@
 tray::AccessibilityDetailedView* TrayAccessibility::CreateDetailedMenu() {
   return new tray::AccessibilityDetailedView(this, login_);
 }
 
 bool TrayAccessibility::GetInitialVisibility() {
   // Shows accessibility icon if any accessibility feature is enabled.
   // Otherwise, doen't show it.
   return GetAccessibilityState() != A11Y_NONE;
 }
 
-views::View* TrayAccessibility::CreateDefaultView(user::LoginStatus status) {
+views::View* TrayAccessibility::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == NULL);
 
   // Shows accessibility menu if:
   // - on login screen (not logged in);
   // - "Enable accessibility menu" on chrome://settings is checked;
   // - or any of accessibility features is enabled
   // Otherwise, not shows it.
   AccessibilityDelegate* delegate =
       Shell::GetInstance()->accessibility_delegate();
-  if (login_ != user::LOGGED_IN_NONE &&
+  if (login_ != LoginStatus::NOT_LOGGED_IN &&
       !delegate->ShouldShowAccessibilityMenu() &&
       // On login screen, keeps the initial visibility of the menu.
-      (status != user::LOGGED_IN_LOCKED || !show_a11y_menu_on_lock_screen_))
+      (status != LoginStatus::LOCKED || !show_a11y_menu_on_lock_screen_))
     return NULL;
 
   CHECK(default_ == NULL);
   default_ = new tray::DefaultAccessibilityView(this);
 
   return default_;
 }
 
-views::View* TrayAccessibility::CreateDetailedView(user::LoginStatus status) {
+views::View* TrayAccessibility::CreateDetailedView(LoginStatus status) {
   CHECK(detailed_popup_ == NULL);
   CHECK(detailed_menu_ == NULL);
 
   if (request_popup_view_state_) {
     detailed_popup_ =
         new tray::AccessibilityPopupView(this, request_popup_view_state_);
     request_popup_view_state_ = A11Y_NONE;
     return detailed_popup_;
   } else {
     Shell::GetInstance()->metrics()->RecordUserMetricsAction(
         ash::UMA_STATUS_AREA_DETAILED_ACCESSABILITY);
     detailed_menu_ = CreateDetailedMenu();
     return detailed_menu_;
   }
 }
 
 void TrayAccessibility::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayAccessibility::DestroyDetailedView() {
   detailed_popup_ = NULL;
   detailed_menu_ = NULL;
 }
 
-void TrayAccessibility::UpdateAfterLoginStatusChange(user::LoginStatus status) {
+void TrayAccessibility::UpdateAfterLoginStatusChange(LoginStatus status) {
   // Stores the a11y feature status on just entering the lock screen.
-  if (login_ != user::LOGGED_IN_LOCKED && status == user::LOGGED_IN_LOCKED)
+  if (login_ != LoginStatus::LOCKED && status == LoginStatus::LOCKED)
     show_a11y_menu_on_lock_screen_ = (GetAccessibilityState() != A11Y_NONE);
 
   login_ = status;
   SetTrayIconVisible(GetInitialVisibility());
 }
 
 void TrayAccessibility::OnAccessibilityModeChanged(
     ui::AccessibilityNotificationVisibility notify) {
   SetTrayIconVisible(GetInitialVisibility());
 
@@ skipping 18 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash