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

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 128 matching lines @@
 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
                     const input_method::InputMethodUtil& util,
                     ash::IMEInfo* info) {
   info->id = ime.id();
   info->name = util.GetInputMethodLongName(ime);
   info->medium_name = util.GetInputMethodMediumName(ime);
   info->short_name = util.GetInputMethodShortName(ime);
   info->third_party = extension_ime_util::IsExtensionIME(ime.id());
 }
 
-gfx::NativeWindow GetNativeWindowByStatus(ash::user::LoginStatus login_status,
+gfx::NativeWindow GetNativeWindowByStatus(ash::LoginStatus login_status,
                                           bool session_started) {
   bool isUserAddingRunning = ash::Shell::GetInstance()
                                  ->session_state_delegate()
                                  ->IsInSecondaryLoginScreen();
 
   int container_id =
-      (!session_started || login_status == ash::user::LOGGED_IN_NONE ||
-       login_status == ash::user::LOGGED_IN_LOCKED || isUserAddingRunning)
+      (!session_started || login_status == ash::LoginStatus::NOT_LOGGED_IN ||
+       login_status == ash::LoginStatus::LOCKED || isUserAddingRunning)
           ? ash::kShellWindowId_LockSystemModalContainer
           : ash::kShellWindowId_SystemModalContainer;
   return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
                                   container_id);
 }
 
 void BluetoothSetDiscoveringError() {
   LOG(ERROR) << "BluetoothSetDiscovering failed.";
 }
 
@@ skipping 36 matching lines @@
       weak_ptr_factory_(this) {
   // Register notifications on construction so that events such as
   // PROFILE_CREATED do not get missed if they happen before Initialize().
   registrar_.reset(new content::NotificationRegistrar);
   registrar_->Add(this,
                   chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                   content::NotificationService::AllSources());
   registrar_->Add(this,
                   chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                   content::NotificationService::AllSources());
-  if (GetUserLoginStatus() == ash::user::LOGGED_IN_NONE) {
+  if (GetUserLoginStatus() == ash::LoginStatus::NOT_LOGGED_IN) {
     registrar_->Add(this,
                     chrome::NOTIFICATION_SESSION_STARTED,
                     content::NotificationService::AllSources());
   }
   registrar_->Add(this,
                   chrome::NOTIFICATION_PROFILE_CREATED,
                   content::NotificationService::AllSources());
   registrar_->Add(this,
                   chrome::NOTIFICATION_PROFILE_DESTROYED,
                   content::NotificationService::AllSources());
@@ skipping 102 matching lines @@
 
   user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
 }
 
 // Overridden from ash::SystemTrayDelegate:
 bool SystemTrayDelegateChromeOS::GetTrayVisibilityOnStartup() {
   // In case of OOBE / sign in screen tray will be shown later.
   return LoginState::Get()->IsUserLoggedIn();
 }
 
-ash::user::LoginStatus SystemTrayDelegateChromeOS::GetUserLoginStatus() const {
+ash::LoginStatus SystemTrayDelegateChromeOS::GetUserLoginStatus() const {
   // All non-logged in ChromeOS specific LOGGED_IN states map to the same
   // Ash specific LOGGED_IN state.

[James Cook, 2016/06/08 00:14:06]

nit: LOGGED_IN -> LoginStatus. Or just delete the comment; I don't think it's
that helpful.

[sky, 2016/06/08 04:01:58]

Done.

   if (!LoginState::Get()->IsUserLoggedIn())
-    return ash::user::LOGGED_IN_NONE;
+    return ash::LoginStatus::NOT_LOGGED_IN;
 
   if (screen_locked_)
-    return ash::user::LOGGED_IN_LOCKED;
+    return ash::LoginStatus::LOCKED;
 
   LoginState::LoggedInUserType user_type =
       LoginState::Get()->GetLoggedInUserType();
   switch (user_type) {
     case LoginState::LOGGED_IN_USER_NONE:
-      return ash::user::LOGGED_IN_NONE;
+      return ash::LoginStatus::NOT_LOGGED_IN;
     case LoginState::LOGGED_IN_USER_REGULAR:
-      return ash::user::LOGGED_IN_USER;
+      return ash::LoginStatus::USER;
     case LoginState::LOGGED_IN_USER_OWNER:
-      return ash::user::LOGGED_IN_OWNER;
+      return ash::LoginStatus::OWNER;
     case LoginState::LOGGED_IN_USER_GUEST:
-      return ash::user::LOGGED_IN_GUEST;
+      return ash::LoginStatus::GUEST;
     case LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT:
-      return ash::user::LOGGED_IN_PUBLIC;
+      return ash::LoginStatus::PUBLIC;
     case LoginState::LOGGED_IN_USER_SUPERVISED:
-      return ash::user::LOGGED_IN_SUPERVISED;
+      return ash::LoginStatus::SUPERVISED;
     case LoginState::LOGGED_IN_USER_KIOSK_APP:
-      return ash::user::LOGGED_IN_KIOSK_APP;
+      return ash::LoginStatus::KIOSK_APP;
   }
   NOTREACHED();
-  return ash::user::LOGGED_IN_NONE;
+  return ash::LoginStatus::NOT_LOGGED_IN;
 }
 
 void SystemTrayDelegateChromeOS::ChangeProfilePicture() {
   content::RecordAction(
       base::UserMetricsAction("OpenChangeProfilePictureDialog"));
   ShowSettingsSubPageForActiveUser(chrome::kChangeProfilePictureSubPage);
 }
 
 std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const {
   return enterprise_domain_;
@@ skipping 157 matching lines @@
       ProfileManager::GetActiveUserProfile());
   chrome::ShowPolicy(displayer.browser());
 }
 
 void SystemTrayDelegateChromeOS::ShowSupervisedUserInfo() {
   // TODO(antrim): find out what should we show in this case.
   // http://crbug.com/229762
 }
 
 void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
-  ash::user::LoginStatus status = GetUserLoginStatus();
+  ash::LoginStatus status = GetUserLoginStatus();
   bool userAddingRunning = ash::Shell::GetInstance()
                                ->session_state_delegate()
                                ->IsInSecondaryLoginScreen();
 
-  if (status == ash::user::LOGGED_IN_NONE ||
-      status == ash::user::LOGGED_IN_LOCKED || userAddingRunning) {
+  if (status == ash::LoginStatus::NOT_LOGGED_IN ||
+      status == ash::LoginStatus::LOCKED || userAddingRunning) {
     scoped_refptr<chromeos::HelpAppLauncher> help_app(
         new chromeos::HelpAppLauncher(GetNativeWindow()));
     help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
   } else {
     chrome::ScopedTabbedBrowserDisplayer displayer(
         ProfileManager::GetActiveUserProfile());
     chrome::ShowSingletonTab(displayer.browser(),
                              GURL(chrome::kLearnMoreEnterpriseURL));
   }
 }
@@ skipping 210 matching lines @@
 bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() {
   return bluetooth_adapter_->IsPowered();
 }
 
 bool SystemTrayDelegateChromeOS::GetBluetoothDiscovering() {
   return (bluetooth_discovery_session_.get() &&
       bluetooth_discovery_session_->IsActive());
 }
 
 void SystemTrayDelegateChromeOS::ChangeProxySettings() {
-  CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE);
+  CHECK(GetUserLoginStatus() == ash::LoginStatus::NOT_LOGGED_IN);
   LoginDisplayHost::default_host()->OpenProxySettings();
 }
 
 ash::CastConfigDelegate* SystemTrayDelegateChromeOS::GetCastConfigDelegate() {
   if (!cast_config_delegate_)
     cast_config_delegate_ = CreateCastConfigDelegate();
   return cast_config_delegate_.get();
 }
 
 ash::NetworkingConfigDelegate*
@@ skipping 286 matching lines @@
   switch (type) {
     case chrome::NOTIFICATION_UPGRADE_RECOMMENDED: {
       ash::UpdateInfo info;
       GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info);
       GetSystemTrayNotifier()->NotifyUpdateRecommended(info);
       break;
     }
     case chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED: {
       // This notification is also sent on login screen when user avatar
       // is loaded from file.
-      if (GetUserLoginStatus() != ash::user::LOGGED_IN_NONE) {
+      if (GetUserLoginStatus() != ash::LoginStatus::NOT_LOGGED_IN) {
         GetSystemTrayNotifier()->NotifyUserUpdate();
       }
       break;
     }
     case chrome::NOTIFICATION_PROFILE_CREATED: {
       SetProfile(content::Source<Profile>(source).ptr());
       registrar_->Remove(this,
                          chrome::NOTIFICATION_PROFILE_CREATED,
                          content::NotificationService::AllSources());
       break;
@@ skipping 233 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos