cros: Move IsUserSupervised and IsUserChild off SystemTrayDelegate

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 <memory>
@@ skipping 95 matching lines @@
 void OnAcceptMultiprofilesIntro(bool no_show_again) {
   PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
   prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
   UserAddingScreen::Get()->Start();
 }
 
 bool IsSessionInSecondaryLoginScreen() {
   return session_manager::SessionManager::Get()->IsInSecondaryLoginScreen();
 }
 
+bool IsUserSupervised() {
+  user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser();
+  return user && user->IsSupervised();
+}
+
 }  // namespace
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
     : networking_config_delegate_(
           base::MakeUnique<NetworkingConfigDelegateChromeos>()) {
   // 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);
   if (GetUserLoginStatus() == ash::LoginStatus::NOT_LOGGED_IN) {
     registrar_->Add(this,
@@ skipping 101 matching lines @@
   if (!IsUserSupervised())
     return base::string16();
   return base::UTF8ToUTF16(SupervisedUserServiceFactory::GetForProfile(
       user_profile_)->GetCustodianName());
 }
 
 base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage()
     const {
   if (!IsUserSupervised())
     return base::string16();
-  if (IsUserChild())
+  if (user_manager::UserManager::Get()->IsLoggedInAsChildUser())
     return GetChildUserMessage();
   return GetLegacySupervisedUserMessage();
 }
 
-bool SystemTrayDelegateChromeOS::IsUserSupervised() const {
-  user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser();
-  return user && user->IsSupervised();
-}
-
-bool SystemTrayDelegateChromeOS::IsUserChild() const {
-  return user_manager::UserManager::Get()->IsLoggedInAsChildUser();
-}
-
 void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
   // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayClient.
   ash::LoginStatus status = GetUserLoginStatus();
   if (status == ash::LoginStatus::NOT_LOGGED_IN ||
       status == ash::LoginStatus::LOCKED || IsSessionInSecondaryLoginScreen()) {
     scoped_refptr<chromeos::HelpAppLauncher> help_app(
         new chromeos::HelpAppLauncher(nullptr /* parent_window */));
     help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
   } else {
     chrome::ScopedTabbedBrowserDisplayer displayer(
@@ skipping 427 matching lines @@
 SystemTrayDelegateChromeOS::GetLegacySupervisedUserMessage() const {
   std::string user_manager_name = GetSupervisedUserManager();
   return l10n_util::GetStringFUTF16(
       IDS_USER_IS_SUPERVISED_BY_NOTICE,
       base::UTF8ToUTF16(user_manager_name));
 }
 
 const base::string16
 SystemTrayDelegateChromeOS::GetChildUserMessage() const {
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+  // TODO(jamescook): If supervised users are always enabled on Chrome OS then
+  // these ifdefs can be removed.
   SupervisedUserService* service =
       SupervisedUserServiceFactory::GetForProfile(user_profile_);
   base::string16 first_custodian =
       base::UTF8ToUTF16(service->GetCustodianEmailAddress());
   base::string16 second_custodian =
       base::UTF8ToUTF16(service->GetSecondCustodianEmailAddress());
   LOG_IF(WARNING, first_custodian.empty()) <<
       "Returning incomplete child user message as manager not known yet.";
   if (second_custodian.empty()) {
     return l10n_util::GetStringFUTF16(
         IDS_CHILD_USER_IS_MANAGED_BY_ONE_PARENT_NOTICE, first_custodian);
   } else {
     return l10n_util::GetStringFUTF16(
         IDS_CHILD_USER_IS_MANAGED_BY_TWO_PARENTS_NOTICE,
         first_custodian,
         second_custodian);
   }
 #endif
 
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos