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

ash/system/cast/tray_cast.cc

 // Copyright 2015 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/cast/tray_cast.h"
 
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_util.h"
@@ skipping 354 matching lines @@
   SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
   Layout();
 }
 
 // This view displays a list of cast receivers that can be clicked on and casted
 // to. It is activated by clicking on the chevron inside of
 // |CastSelectDefaultView|.
 class CastDetailedView : public TrayDetailsView, public ViewClickListener {
  public:
   CastDetailedView(SystemTrayItem* owner,
-                   user::LoginStatus login,
+                   LoginStatus login,
                    const CastConfigDelegate::ReceiversAndActivities&
                        receivers_and_activities);
   ~CastDetailedView() override;
 
   // Makes the detail view think the view associated with the given receiver_id
   // was clicked. This will start a cast.
   void SimulateViewClickedForTest(const std::string& receiver_id);
 
   // Updates the list of available receivers.
   void UpdateReceiverList(const CastConfigDelegate::ReceiversAndActivities&
                               new_receivers_and_activities);
 
  private:
   void CreateItems();
 
   void UpdateReceiverListFromCachedData();
   views::View* AddToReceiverList(
       const CastConfigDelegate::ReceiverAndActivity& receiverActivity);
 
   void AppendSettingsEntries();
   void AppendHeaderEntry();
 
   // Overridden from ViewClickListener.
   void OnViewClicked(views::View* sender) override;
 
-  user::LoginStatus login_;
+  LoginStatus login_;
   views::View* options_ = nullptr;
   // A mapping from the receiver id to the receiver/activity data.
   std::map<std::string, CastConfigDelegate::ReceiverAndActivity>
       receivers_and_activities_;
   // A mapping from the view pointer to the associated activity id.
   std::map<views::View*, std::string> receiver_activity_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CastDetailedView);
 };
 
 CastDetailedView::CastDetailedView(
     SystemTrayItem* owner,
-    user::LoginStatus login,
+    LoginStatus login,
     const CastConfigDelegate::ReceiversAndActivities& receivers_and_activities)
     : TrayDetailsView(owner), login_(login) {
   CreateItems();
   UpdateReceiverList(receivers_and_activities);
 }
 
 CastDetailedView::~CastDetailedView() {
 }
 
 void CastDetailedView::SimulateViewClickedForTest(
@@ skipping 74 matching lines @@
   scroll_content()->AddChildView(container);
   return container;
 }
 
 void CastDetailedView::AppendSettingsEntries() {
   // Settings requires a browser window, hide it for non logged in user.
   const bool userAddingRunning = 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)
     return;
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   HoverHighlightView* container = new HoverHighlightView(this);
   container->AddLabel(rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_CAST_OPTIONS),
                       gfx::ALIGN_LEFT, false /* highlight */);
 
   AddChildView(container);
   options_ = container;
@@ skipping 43 matching lines @@
 }
 
 const std::string& TrayCast::GetDisplayedCastId() {
   return default_->cast_view()->displayed_activity_id();
 }
 
 const views::View* TrayCast::GetDefaultView() const {
   return default_;
 }
 
-views::View* TrayCast::CreateTrayView(user::LoginStatus status) {
+views::View* TrayCast::CreateTrayView(LoginStatus status) {
   CHECK(tray_ == nullptr);
   tray_ = new tray::CastTrayView(this);
   tray_->SetVisible(is_casting_);
   return tray_;
 }
 
-views::View* TrayCast::CreateDefaultView(user::LoginStatus status) {
+views::View* TrayCast::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == nullptr);
 
   if (HasCastExtension()) {
     ash::CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
 
     // Add the cast observer here instead of the ctor for two reasons:
     // - The ctor gets called too early in the initialization cycle (at least
     //   for the tests); the correct profile hasn't been setup yet.
     // - If we're using the cast extension backend (media router is disabled),
     //   then the user can install the extension at any point in time. The
     //   return value of HasCastExtension() can change, so only checking it in
     //   the ctor isn't enough.
     if (!added_observer_) {
       cast_config_delegate->AddObserver(this);
       added_observer_ = true;
     }
 
     // The extension updates its view model whenever the popup is opened, so we
     // probably should as well.
     cast_config_delegate->RequestDeviceRefresh();
   }
 
-  default_ = new tray::CastDuplexView(this, status != user::LOGGED_IN_LOCKED,
+  default_ = new tray::CastDuplexView(this, status != LoginStatus::LOCKED,
                                       receivers_and_activities_);
   default_->set_id(TRAY_VIEW);
   default_->select_view()->set_id(SELECT_VIEW);
   default_->cast_view()->set_id(CAST_VIEW);
 
   UpdatePrimaryView();
   return default_;
 }
 
-views::View* TrayCast::CreateDetailedView(user::LoginStatus status) {
+views::View* TrayCast::CreateDetailedView(LoginStatus status) {
   Shell::GetInstance()->metrics()->RecordUserMetricsAction(
       ash::UMA_STATUS_AREA_DETAILED_CAST_VIEW);
   CHECK(detailed_ == nullptr);
   detailed_ =
       new tray::CastDetailedView(this, status, receivers_and_activities_);
   return detailed_;
 }
 
 void TrayCast::DestroyTrayView() {
   tray_ = nullptr;
@@ skipping 49 matching lines @@
   is_casting_ = started;
   UpdatePrimaryView();
 }
 
 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (tray_)
     tray_->UpdateAlignment(alignment);
 }
 
 }  // namespace ash