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

ash/system/tray/system_tray.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/system_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 75 matching lines @@
   // Takes ownership of |bubble|.
   explicit SystemBubbleWrapper(SystemTrayBubble* bubble)
       : bubble_(bubble), is_persistent_(false) {}
 
   // Initializes the bubble view and creates |bubble_wrapper_|.
   void InitView(TrayBackgroundView* tray,
                 views::View* anchor,
                 TrayBubbleView::InitParams* init_params,
                 bool is_persistent) {
     DCHECK(anchor);
-    user::LoginStatus login_status =
+    LoginStatus login_status =
         Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
     bubble_->InitView(anchor, login_status, init_params);
     bubble_wrapper_.reset(new TrayBubbleWrapper(tray, bubble_->bubble_view()));
     // The system bubble should not have an arrow.
     bubble_->bubble_view()->SetArrowPaintType(
         views::BubbleBorder::PAINT_NONE);
     is_persistent_ = is_persistent;
 
     // If ChromeVox is enabled, focus the default item if no item is focused and
     // there isn't a delayed close.
@@ skipping 192 matching lines @@
   std::vector<SystemTrayItem*>::iterator found_iter =
       std::find(notification_items_.begin(), notification_items_.end(), item);
   if (found_iter == notification_items_.end())
     return;
   notification_items_.erase(found_iter);
   // Only update the notification bubble if visible (i.e. don't create one).
   if (notification_bubble_)
     UpdateNotificationBubble();
 }
 
-void SystemTray::UpdateAfterLoginStatusChange(user::LoginStatus login_status) {
+void SystemTray::UpdateAfterLoginStatusChange(LoginStatus login_status) {
   DestroySystemBubble();
   UpdateNotificationBubble();
 
   for (SystemTrayItem* item : items_)
     item->UpdateAfterLoginStatusChange(login_status);
 
   // Items default to SHELF_ALIGNMENT_BOTTOM. Update them if the initial
   // position of the shelf differs.
   if (!IsHorizontalAlignment(shelf_alignment()))
     UpdateAfterShelfAlignmentChange(shelf_alignment());
@@ skipping 126 matching lines @@
 }
 
 void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items,
                            bool detailed,
                            bool can_activate,
                            BubbleCreationType creation_type,
                            int arrow_offset,
                            bool persistent) {
   // No system tray bubbles in kiosk mode.
   if (Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() ==
-      ash::user::LOGGED_IN_KIOSK_APP) {
+      LoginStatus::KIOSK_APP) {
     return;
   }
 
   // Destroy any existing bubble and create a new one.
   SystemTrayBubble::BubbleType bubble_type = detailed ?
       SystemTrayBubble::BUBBLE_TYPE_DETAILED :
       SystemTrayBubble::BUBBLE_TYPE_DEFAULT;
 
   // Destroy the notification bubble here so that it doesn't get rebuilt
   // while we add items to the main bubble_ (e.g. in HideNotificationView).
@@ skipping 289 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash