remove demo mode detector
Bug: b:212502989
Change-Id: Iffcb3f8873ad6d27e66346e586ea8b42e266d05f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3609217
Reviewed-by: Dominic Battré <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Commit-Queue: Geng Li <[email protected]>
Cr-Commit-Position: refs/heads/main@{#997423}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3a735908..a2f2393 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -326,7 +326,6 @@
#include "chrome/browser/ash/guest_os/guest_os_mime_types_service.h"
#include "chrome/browser/ash/guest_os/guest_os_pref_names.h"
#include "chrome/browser/ash/lock_screen_apps/state_controller.h"
-#include "chrome/browser/ash/login/demo_mode/demo_mode_detector.h"
#include "chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h"
#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
@@ -766,6 +765,11 @@
"user_experience_metrics.stability.renderer_launch_count";
#endif // !BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+// Deprecated 04/2022.
+const char kTimeOnOobe[] = "settings.time_on_oobe";
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -1004,6 +1008,10 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterIntegerPref(kAccountManagerNumTimesWelcomeScreenShown, 0);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+ registry->RegisterIntegerPref(kTimeOnOobe, 0);
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
}
} // namespace
@@ -1117,7 +1125,6 @@
RegisterLocalStatePrefs(registry);
chromeos::bluetooth_config::DeviceNameManagerImpl::RegisterLocalStatePrefs(
registry);
- ash::DemoModeDetector::RegisterPrefs(registry);
ash::DemoModeResourcesRemover::RegisterLocalStatePrefs(registry);
ash::DemoSession::RegisterLocalStatePrefs(registry);
ash::DemoSetupController::RegisterLocalStatePrefs(registry);
@@ -1957,6 +1964,11 @@
profile_prefs->ClearPref(kAccountManagerNumTimesWelcomeScreenShown);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+ // Added 04/2022
+ profile_prefs->ClearPref(kTimeOnOobe);
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
