Remove ARC kiosk specific directories
This is the first step towards removing support for ARC Kiosk sessions,
since the last board that supported this is now EOL.
Bug: b/336756417
Change-Id: I3a2a8652124c31ffb64631251462756246aabf15
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5527061
Reviewed-by: Irina Fedorova <[email protected]>
Reviewed-by: Dominic Battre <[email protected]>
Commit-Queue: Jeroen Dhollander <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1301406}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 7433972..e7e44318 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -345,7 +345,6 @@
#include "chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller.h"
#include "chrome/browser/ash/app_list/app_list_syncable_service.h"
#include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
-#include "chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_cryptohome_remover.h"
#include "chrome/browser/ash/app_mode/kiosk_system_session.h"
@@ -1060,6 +1059,7 @@
// Deprecated 05/2024.
// A preference to keep track of the device registered time.
constexpr char kDeviceRegisteredTime[] = "DeviceRegisteredTime";
+constexpr char kArcKioskDictionaryName[] = "arc-kiosk";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if !BUILDFLAG(IS_ANDROID)
@@ -1209,6 +1209,7 @@
// Deprecated 05/2024.
registry->RegisterTimePref(kDeviceRegisteredTime, base::Time());
+ registry->RegisterDictionaryPref(kArcKioskDictionaryName);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 04/2024.
@@ -1705,7 +1706,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
arc::prefs::RegisterLocalStatePrefs(registry);
ChromeOSMetricsProvider::RegisterPrefs(registry);
- ash::ArcKioskAppManager::RegisterPrefs(registry);
ash::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
ash::carrier_lock::CarrierLockManager::RegisterLocalPrefs(registry);
ash::cert_provisioning::RegisterLocalStatePrefs(registry);
@@ -2468,6 +2468,7 @@
// Added 05/2024.
local_state->ClearPref(kDeviceRegisteredTime);
+ local_state->ClearPref(kArcKioskDictionaryName);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 04/2024 .
