kiosk: Rename IsLoggedInAsKioskApp to specify chrome apps

Renames UserManager::IsLoggedInAsKioskApp to IsLoggedInAsKioskChromeApp.
This method was created when chrome app kiosk was the only kiosk type.
Currently kiosk mode supports multiple app types and there were cases
where this method was confused with IsLoggedInAsAnyKioskApp and
incorrectly used to check for any kiosk user. This CL renames the
method to define that it only applies to chrome apps and avoid logic
errors.

Bug: 41363973
Change-Id: Id5a7a9c72cdacc64a43083f05e1426d8c41f8d5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6491532
Reviewed-by: Stefan Kuhne <skuhne@chromium.org>
Commit-Queue: Sergii Bykov <sbykov@google.com>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1452039}

apps/launcher.cc

@@ -381,7 +381,7 @@ void LaunchPlatformAppWithCommandLineAndLaunchId(
     bool in_kiosk_mode = false;
 #if BUILDFLAG(IS_CHROMEOS)
     user_manager::UserManager* user_manager = user_manager::UserManager::Get();
-    in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskApp();
+    in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskChromeApp();
 #endif
     if (!in_kiosk_mode) {
       NOTREACHED() << "App with 'kiosk_only' attribute must be run in "

chrome/browser/ash/app_list/arc/arc_app_list_prefs.cc

@@ -1198,7 +1198,7 @@ void ArcAppListPrefs::SetLastLaunchTimeInternal(const std::string& app_id) {
     const user_manager::UserManager* user_manager =
         user_manager::UserManager::Get();
     if (arc::ArcSessionManager::Get()->skipped_terms_of_service_negotiation() &&
-        !user_manager->IsLoggedInAsKioskApp() &&
+        !user_manager->IsLoggedInAsKioskChromeApp() &&
         !ash::UserSessionManager::GetInstance()->ui_shown_time().is_null()) {
       UMA_HISTOGRAM_CUSTOM_TIMES(
           "Arc.FirstAppLaunchRequest.TimeDelta",

chrome/browser/ash/login/users/fake_chrome_user_manager.cc

@@ -378,7 +378,7 @@ bool FakeChromeUserManager::IsLoggedInAsGuest() const {
                      : false;
 }
 
-bool FakeChromeUserManager::IsLoggedInAsKioskApp() const {
+bool FakeChromeUserManager::IsLoggedInAsKioskChromeApp() const {
   const user_manager::User* active_user = GetActiveUser();
   return active_user
              ? active_user->GetType() == user_manager::UserType::kKioskApp

chrome/browser/ash/login/users/fake_chrome_user_manager.h

@@ -104,7 +104,7 @@ class FakeChromeUserManager : public user_manager::UserManagerImpl {
   bool IsLoggedInAsChildUser() const override;
   bool IsLoggedInAsManagedGuestSession() const override;
   bool IsLoggedInAsGuest() const override;
-  bool IsLoggedInAsKioskApp() const override;
+  bool IsLoggedInAsKioskChromeApp() const override;
   bool IsLoggedInAsWebKioskApp() const override;
   bool IsLoggedInAsKioskIWA() const override;
   bool IsLoggedInAsAnyKioskApp() const override;

chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.cc

@@ -39,7 +39,7 @@ using remoting::features::kEnableCrdSharedSessionToUnattendedDevice;
 
 const ash::KioskAppManagerBase* GetKioskAppManager(
     const user_manager::UserManager& user_manager) {
-  if (user_manager.IsLoggedInAsKioskApp()) {
+  if (user_manager.IsLoggedInAsKioskChromeApp()) {
     return ash::KioskChromeAppManager::Get();
   }
   if (user_manager.IsLoggedInAsWebKioskApp()) {

chrome/browser/extensions/crx_installer.cc

@@ -763,7 +763,7 @@ void CrxInstaller::ConfirmInstall() {
     bool in_kiosk_mode = false;
 #if BUILDFLAG(IS_CHROMEOS)
     user_manager::UserManager* user_manager = user_manager::UserManager::Get();
-    in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskApp();
+    in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskChromeApp();
 #endif
     if (!in_kiosk_mode) {
       ReportFailureFromUIThread(CrxInstallError(

chrome/browser/extensions/updater/extension_updater.cc

@@ -373,7 +373,7 @@ void ExtensionUpdater::AddToDownloader(
   bool kiosk_crx_manifest_update_url_ignored = false;
 #if BUILDFLAG(IS_CHROMEOS)
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
-  if (user_manager && user_manager->IsLoggedInAsKioskApp()) {
+  if (user_manager && user_manager->IsLoggedInAsKioskChromeApp()) {
     ash::CrosSettings::Get()->GetBoolean(
         ash::kKioskCRXManifestUpdateURLIgnored,
         &kiosk_crx_manifest_update_url_ignored);

chrome/browser/invalidation/profile_invalidation_provider_factory.cc

@@ -123,7 +123,7 @@ ProfileInvalidationProviderFactory::BuildServiceInstanceForBrowserContext(
   policy::BrowserPolicyConnectorAsh* connector =
       g_browser_process->platform_part()->browser_policy_connector_ash();
   if (user_manager::UserManager::IsInitialized() &&
-      user_manager::UserManager::Get()->IsLoggedInAsKioskApp() &&
+      user_manager::UserManager::Get()->IsLoggedInAsKioskChromeApp() &&
       connector->IsDeviceEnterpriseManaged()) {
     identity_provider = std::make_unique<DeviceIdentityProvider>(
         DeviceOAuth2TokenServiceFactory::Get());

chrome/browser/profiles/profiles_state.cc

@@ -309,7 +309,7 @@ bool IsDemoSession() {
 
 bool IsChromeAppKioskSession() {
 #if BUILDFLAG(IS_CHROMEOS)
-  return user_manager::UserManager::Get()->IsLoggedInAsKioskApp();
+  return user_manager::UserManager::Get()->IsLoggedInAsKioskChromeApp();
 #else
   return false;
 #endif

chrome/browser/web_applications/web_app_utils.cc

@@ -287,7 +287,7 @@ bool AreWebAppsEnabled(Profile* profile) {
   auto* user_manager = user_manager::UserManager::Get();
 
   // Don't enable for Chrome App Kiosk sessions.
-  if (user_manager && user_manager->IsLoggedInAsKioskApp()) {
+  if (user_manager && user_manager->IsLoggedInAsKioskChromeApp()) {
     return false;
   }
 

components/user_manager/user_manager.h

@@ -453,8 +453,8 @@ class USER_MANAGER_EXPORT UserManager {
   // Returns true if we're logged in as a Guest.
   virtual bool IsLoggedInAsGuest() const = 0;
 
-  // Returns true if we're logged in as a kiosk app.
-  virtual bool IsLoggedInAsKioskApp() const = 0;
+  // Returns true if we're logged in as a kiosk Chrome app.
+  virtual bool IsLoggedInAsKioskChromeApp() const = 0;
 
   // Returns true if we're logged in as a Web kiosk app.
   virtual bool IsLoggedInAsWebKioskApp() const = 0;

components/user_manager/user_manager_impl.cc

@@ -990,7 +990,7 @@ bool UserManagerImpl::IsLoggedInAsGuest() const {
   return IsUserLoggedIn() && active_user_->GetType() == UserType::kGuest;
 }
 
-bool UserManagerImpl::IsLoggedInAsKioskApp() const {
+bool UserManagerImpl::IsLoggedInAsKioskChromeApp() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return IsUserLoggedIn() && active_user_->GetType() == UserType::kKioskApp;
 }

components/user_manager/user_manager_impl.h

@@ -208,7 +208,7 @@ class USER_MANAGER_EXPORT UserManagerImpl : public UserManager {
   bool IsLoggedInAsChildUser() const override;
   bool IsLoggedInAsManagedGuestSession() const override;
   bool IsLoggedInAsGuest() const override;
-  bool IsLoggedInAsKioskApp() const override;
+  bool IsLoggedInAsKioskChromeApp() const override;
   bool IsLoggedInAsWebKioskApp() const override;
   bool IsLoggedInAsKioskIWA() const override;
   bool IsLoggedInAsAnyKioskApp() const override;