diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 5bfbefae5b85..a17b4a6000f7 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -36,6 +36,7 @@ #include "brave/components/de_amp/common/pref_names.h" #include "brave/components/debounce/browser/debounce_service.h" #include "brave/components/ipfs/buildflags/buildflags.h" +#include "brave/components/ntp_background_images/browser/view_counter_service.h" #include "brave/components/ntp_background_images/buildflags/buildflags.h" #include "brave/components/omnibox/browser/brave_omnibox_prefs.h" #include "brave/components/request_otr/common/buildflags/buildflags.h" @@ -270,6 +271,10 @@ void RegisterProfilePrefsForMigration( registry->RegisterListPref(pref); } #endif + + // Added 2023-09 + ntp_background_images::ViewCounterService::RegisterProfilePrefsForMigration( + registry); } void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { diff --git a/chromium_src/chrome/browser/prefs/browser_prefs.cc b/chromium_src/chrome/browser/prefs/browser_prefs.cc index fcf45023326a..74cceff341d1 100644 --- a/chromium_src/chrome/browser/prefs/browser_prefs.cc +++ b/chromium_src/chrome/browser/prefs/browser_prefs.cc @@ -17,6 +17,7 @@ #include "brave/components/brave_wallet/browser/keyring_service.h" #include "brave/components/constants/pref_names.h" #include "brave/components/decentralized_dns/core/utils.h" +#include "brave/components/ntp_background_images/browser/view_counter_service.h" #include "brave/components/ntp_background_images/buildflags/buildflags.h" #include "brave/components/omnibox/browser/brave_omnibox_prefs.h" #include "brave/components/tor/buildflags/buildflags.h" @@ -229,6 +230,10 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { } #endif + // Added 2023-09 + ntp_background_images::ViewCounterService::MigrateObsoleteProfilePrefs( + profile->GetPrefs()); + // END_MIGRATE_OBSOLETE_PROFILE_PREFS } diff --git a/components/ntp_background_images/browser/view_counter_service.cc b/components/ntp_background_images/browser/view_counter_service.cc index 0c794b740aa4..15532e7528d9 100644 --- a/components/ntp_background_images/browser/view_counter_service.cc +++ b/components/ntp_background_images/browser/view_counter_service.cc @@ -48,6 +48,10 @@ constexpr char kSponsoredNewTabsHistogramName[] = "Brave.NTP.SponsoredNewTabsCreated"; constexpr int kSponsoredNewTabsBuckets[] = {0, 10, 20, 30, 40, 50}; +// Obsolete pref +constexpr char kObsoleteCountToBrandedWallpaperPref[] = + "brave.count_to_branded_wallpaper"; + } // namespace namespace ntp_background_images { @@ -72,6 +76,17 @@ void ViewCounterService::RegisterProfilePrefs( prefs::kNewTabPageShowBackgroundImage, true); } +void ViewCounterService::RegisterProfilePrefsForMigration( + user_prefs::PrefRegistrySyncable* registry) { + // Added 09/2023 + registry->RegisterIntegerPref(kObsoleteCountToBrandedWallpaperPref, 0); +} + +void ViewCounterService::MigrateObsoleteProfilePrefs(PrefService* prefs) { + // Added 09/2023 + prefs->ClearPref(kObsoleteCountToBrandedWallpaperPref); +} + ViewCounterService::ViewCounterService( NTPBackgroundImagesService* service, BraveNTPCustomBackgroundService* custom_service, diff --git a/components/ntp_background_images/browser/view_counter_service.h b/components/ntp_background_images/browser/view_counter_service.h index 52f8c3bddba6..cde48a024c91 100644 --- a/components/ntp_background_images/browser/view_counter_service.h +++ b/components/ntp_background_images/browser/view_counter_service.h @@ -63,6 +63,9 @@ class ViewCounterService : public KeyedService, static void RegisterLocalStatePrefs(PrefRegistrySimple* registry); static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); + static void RegisterProfilePrefsForMigration( + user_prefs::PrefRegistrySyncable* registry); + static void MigrateObsoleteProfilePrefs(PrefService* prefs); // Lets the counter know that a New Tab Page view has occured. // This should always be called as it will evaluate whether the user has