[iOS] Update browser prefs override to avoid patch/sources.gni (#30539)
This commit is contained in:
Kyle Hickinson
@@ -3,90 +3,21 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h"
|
||||
#include "brave/components/ai_chat/core/browser/model_service.h"
|
||||
#include "brave/components/ai_chat/core/common/pref_names.h"
|
||||
#include "brave/components/brave_ads/core/public/prefs/obsolete_pref_util.h"
|
||||
#include "brave/components/brave_ads/core/public/prefs/pref_registry.h"
|
||||
#include "brave/components/brave_news/common/pref_names.h"
|
||||
#include "brave/components/brave_rewards/core/pref_registry.h"
|
||||
#include "brave/components/brave_shields/core/browser/brave_shields_p3a.h"
|
||||
#include "brave/components/brave_shields/core/common/pref_names.h"
|
||||
#include "brave/components/brave_sync/brave_sync_prefs.h"
|
||||
#include "brave/components/brave_wallet/browser/brave_wallet_prefs.h"
|
||||
#include "brave/components/brave_wallet/browser/keyring_service.h"
|
||||
#include "brave/components/de_amp/common/pref_names.h"
|
||||
#include "brave/components/debounce/core/browser/debounce_service.h"
|
||||
#include "brave/components/decentralized_dns/core/utils.h"
|
||||
#include "brave/components/l10n/common/prefs.h"
|
||||
#include "brave/components/ntp_background_images/browser/ntp_background_images_service.h"
|
||||
#include "brave/components/ntp_background_images/common/view_counter_pref_registry.h"
|
||||
#include "brave/components/omnibox/browser/brave_omnibox_prefs.h"
|
||||
#include "brave/components/p3a/metric_log_store.h"
|
||||
#include "brave/components/p3a/p3a_service.h"
|
||||
#include "brave/components/p3a/rotation_scheduler.h"
|
||||
#include "brave/components/skus/browser/skus_utils.h"
|
||||
#include "brave/ios/browser/brave_stats/brave_stats_prefs.h"
|
||||
#include "components/pref_registry/pref_registry_syncable.h"
|
||||
#include "ios/chrome/browser/shared/model/prefs/pref_names.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
|
||||
void BraveRegisterBrowserStatePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
brave_ads::RegisterProfilePrefs(registry);
|
||||
brave_ads::RegisterProfilePrefsForMigration(registry);
|
||||
brave_rewards::RegisterProfilePrefs(registry);
|
||||
brave_rewards::RegisterProfilePrefsForMigration(registry);
|
||||
brave_sync::Prefs::RegisterProfilePrefs(registry);
|
||||
brave_wallet::RegisterProfilePrefs(registry);
|
||||
brave_wallet::RegisterProfilePrefsForMigration(registry);
|
||||
de_amp::RegisterProfilePrefs(registry);
|
||||
debounce::DebounceService::RegisterProfilePrefs(registry);
|
||||
ai_chat::prefs::RegisterProfilePrefs(registry);
|
||||
ai_chat::ModelService::RegisterProfilePrefs(registry);
|
||||
omnibox::RegisterBraveProfilePrefs(registry);
|
||||
brave_news::prefs::RegisterProfilePrefs(registry);
|
||||
ntp_background_images::RegisterProfilePrefs(registry);
|
||||
ntp_background_images::RegisterProfilePrefsForMigration(registry);
|
||||
brave_shields::RegisterShieldsP3AProfilePrefs(registry);
|
||||
brave_shields::RegisterShieldsP3AProfilePrefsForMigration(registry);
|
||||
}
|
||||
|
||||
void BraveRegisterLocalStatePrefs(PrefRegistrySimple* registry) {
|
||||
brave_stats::RegisterLocalStatePrefs(registry);
|
||||
brave_wallet::RegisterLocalStatePrefs(registry);
|
||||
brave_wallet::RegisterLocalStatePrefsForMigration(registry);
|
||||
decentralized_dns::RegisterLocalStatePrefs(registry);
|
||||
skus::RegisterLocalStatePrefs(registry);
|
||||
p3a::P3AService::RegisterPrefs(registry, false);
|
||||
p3a::MetricLogStore::RegisterLocalStatePrefsForMigration(registry);
|
||||
p3a::RotationScheduler::RegisterLocalStatePrefsForMigration(registry);
|
||||
ntp_background_images::NTPBackgroundImagesService::RegisterLocalStatePrefs(
|
||||
registry);
|
||||
brave_l10n::RegisterLocalStatePrefsForMigration(registry);
|
||||
ai_chat::prefs::RegisterLocalStatePrefs(registry);
|
||||
ai_chat::AIChatMetrics::RegisterPrefs(registry);
|
||||
ntp_background_images::RegisterLocalStatePrefs(registry);
|
||||
|
||||
// brave_shields
|
||||
// Note this can be removed when we use the entire
|
||||
// `brave_shields:AdBlockService` And we can call its
|
||||
// `RegisterPrefsForAdBlockService`
|
||||
registry->RegisterDictionaryPref(
|
||||
brave_shields::prefs::kAdBlockRegionalFilters);
|
||||
registry->RegisterDictionaryPref(
|
||||
brave_shields::prefs::kAdBlockListSubscriptions);
|
||||
registry->RegisterBooleanPref(
|
||||
brave_shields::prefs::kAdBlockCheckedAllDefaultRegions, false);
|
||||
registry->RegisterBooleanPref(
|
||||
brave_shields::prefs::kAdBlockCheckedDefaultRegion, false);
|
||||
|
||||
brave_shields::RegisterShieldsP3ALocalPrefs(registry);
|
||||
}
|
||||
namespace brave {
|
||||
void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry);
|
||||
void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
|
||||
void MigrateObsoleteProfilePrefs(PrefService* prefs);
|
||||
void MigrateObsoleteLocalStatePrefs(PrefService* prefs);
|
||||
} // namespace brave
|
||||
|
||||
#define BRAVE_REGISTER_BROWSER_STATE_PREFS \
|
||||
BraveRegisterBrowserStatePrefs(registry);
|
||||
brave::RegisterBrowserStatePrefs(registry);
|
||||
|
||||
#define BRAVE_REGISTER_LOCAL_STATE_PREFS BraveRegisterLocalStatePrefs(registry);
|
||||
#define BRAVE_REGISTER_LOCAL_STATE_PREFS \
|
||||
brave::RegisterLocalStatePrefs(registry);
|
||||
|
||||
#define MigrateObsoleteProfilePrefs MigrateObsoleteProfilePrefs_ChromiumImpl
|
||||
|
||||
@@ -102,15 +33,10 @@ void BraveRegisterLocalStatePrefs(PrefRegistrySimple* registry) {
|
||||
|
||||
void MigrateObsoleteProfilePrefs(PrefService* prefs) {
|
||||
MigrateObsoleteProfilePrefs_ChromiumImpl(prefs);
|
||||
|
||||
brave_ads::MigrateObsoleteProfilePrefs(prefs);
|
||||
brave_wallet::MigrateObsoleteProfilePrefs(prefs);
|
||||
ntp_background_images::MigrateObsoleteProfilePrefs(prefs);
|
||||
brave::MigrateObsoleteProfilePrefs(prefs);
|
||||
}
|
||||
|
||||
void MigrateObsoleteLocalStatePrefs(PrefService* prefs) {
|
||||
MigrateObsoleteLocalStatePrefs_ChromiumImpl(prefs);
|
||||
|
||||
p3a::MetricLogStore::MigrateObsoleteLocalStatePrefs(prefs);
|
||||
p3a::RotationScheduler::MigrateObsoleteLocalStatePrefs(prefs);
|
||||
brave::MigrateObsoleteLocalStatePrefs(prefs);
|
||||
}
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
# Copyright (c) 2023 The Brave Authors. All rights reserved.
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
# You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
|
||||
brave_browser_prefs_deps = [
|
||||
"//brave/components/brave_ads/core",
|
||||
"//brave/components/brave_news/common",
|
||||
"//brave/components/brave_rewards/core",
|
||||
"//brave/components/brave_shields/core/browser",
|
||||
"//brave/components/brave_shields/core/common",
|
||||
"//brave/components/brave_sync:prefs",
|
||||
"//brave/components/brave_wallet/browser",
|
||||
"//brave/components/de_amp/common",
|
||||
"//brave/components/debounce/core/browser",
|
||||
"//brave/components/decentralized_dns/core",
|
||||
"//brave/components/ntp_background_images/browser",
|
||||
"//brave/components/p3a",
|
||||
"//brave/components/skus/browser",
|
||||
"//brave/ios/browser/brave_stats",
|
||||
]
|
||||
@@ -20,6 +20,7 @@ static_library("common") {
|
||||
"//brave/components/sidebar/browser",
|
||||
"//brave/components/text_recognition/browser",
|
||||
"//brave/ios/browser/api/ads",
|
||||
"//brave/ios/browser/shared/prefs",
|
||||
"//brave/test:*",
|
||||
"//chrome/browser",
|
||||
]
|
||||
|
||||
@@ -50,6 +50,7 @@ group("browser") {
|
||||
"//brave/ios/browser/brave_wallet",
|
||||
"//brave/ios/browser/policy",
|
||||
"//brave/ios/browser/profile/model",
|
||||
"//brave/ios/browser/shared/prefs",
|
||||
"//brave/ios/browser/ui/webui",
|
||||
"//brave/ios/browser/web",
|
||||
"//brave/ios/components/prefs",
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
# Copyright (c) 2025 The Brave Authors. All rights reserved.
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
# You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
|
||||
source_set("prefs") {
|
||||
sources = [ "browser_prefs_impl.mm" ]
|
||||
deps = [
|
||||
"//brave/components/ai_chat/core/browser",
|
||||
"//brave/components/ai_chat/core/common",
|
||||
"//brave/components/brave_ads/core",
|
||||
"//brave/components/brave_news/common",
|
||||
"//brave/components/brave_rewards/core",
|
||||
"//brave/components/brave_shields/core/browser",
|
||||
"//brave/components/brave_shields/core/common",
|
||||
"//brave/components/brave_sync:prefs",
|
||||
"//brave/components/brave_wallet/browser",
|
||||
"//brave/components/de_amp/common",
|
||||
"//brave/components/debounce/core/browser",
|
||||
"//brave/components/decentralized_dns/core",
|
||||
"//brave/components/l10n/common",
|
||||
"//brave/components/ntp_background_images/browser",
|
||||
"//brave/components/p3a",
|
||||
"//brave/components/skus/browser",
|
||||
"//brave/ios/browser/brave_stats",
|
||||
"//components/omnibox/browser",
|
||||
"//components/pref_registry",
|
||||
"//components/prefs",
|
||||
"//ios/chrome/browser/shared/model/prefs",
|
||||
]
|
||||
}
|
||||
+4
-9
@@ -1,25 +1,20 @@
|
||||
include_rules = [
|
||||
"+brave/components/ai_chat/core",
|
||||
"+brave/components/brave_ads/core/public",
|
||||
"+brave/components/brave_news/common",
|
||||
"+brave/components/brave_rewards/core",
|
||||
"+brave/components/brave_shields/core/browser",
|
||||
"+brave/components/brave_shields/core/common",
|
||||
"+brave/components/brave_sync",
|
||||
"+brave/components/brave_wallet/browser",
|
||||
"+brave/components/de_amp/common",
|
||||
"+brave/components/debounce/core/browser",
|
||||
"+brave/components/decentralized_dns/core",
|
||||
"+brave/components/ipfs",
|
||||
"+brave/components/l10n/common",
|
||||
"+brave/components/ntp_background_images/browser",
|
||||
"+brave/components/ntp_background_images/common",
|
||||
"+brave/components/omnibox/browser",
|
||||
"+brave/components/brave_shields/core/common",
|
||||
"+brave/components/p3a",
|
||||
"+brave/components/skus/browser",
|
||||
"+brave/ios/browser/brave_stats",
|
||||
"+brave/components/brave_shields/core/browser",
|
||||
]
|
||||
|
||||
specific_include_rules = {
|
||||
"browser_prefs\.mm": [
|
||||
"!brave/components/l10n/common/prefs.h",
|
||||
],
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
// Copyright (c) 2025 The Brave Authors. All rights reserved.
|
||||
// This Source Code Form is subject to the terms of the Mozilla Public
|
||||
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
|
||||
#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h"
|
||||
#include "brave/components/ai_chat/core/browser/model_service.h"
|
||||
#include "brave/components/ai_chat/core/common/pref_names.h"
|
||||
#include "brave/components/brave_ads/core/public/prefs/obsolete_pref_util.h"
|
||||
#include "brave/components/brave_ads/core/public/prefs/pref_registry.h"
|
||||
#include "brave/components/brave_news/common/pref_names.h"
|
||||
#include "brave/components/brave_rewards/core/pref_registry.h"
|
||||
#include "brave/components/brave_shields/core/browser/brave_shields_p3a.h"
|
||||
#include "brave/components/brave_shields/core/common/pref_names.h"
|
||||
#include "brave/components/brave_sync/brave_sync_prefs.h"
|
||||
#include "brave/components/brave_wallet/browser/brave_wallet_prefs.h"
|
||||
#include "brave/components/brave_wallet/browser/keyring_service.h"
|
||||
#include "brave/components/de_amp/common/pref_names.h"
|
||||
#include "brave/components/debounce/core/browser/debounce_service.h"
|
||||
#include "brave/components/decentralized_dns/core/utils.h"
|
||||
#include "brave/components/l10n/common/prefs.h"
|
||||
#include "brave/components/ntp_background_images/browser/ntp_background_images_service.h"
|
||||
#include "brave/components/ntp_background_images/common/view_counter_pref_registry.h"
|
||||
#include "brave/components/omnibox/browser/brave_omnibox_prefs.h"
|
||||
#include "brave/components/p3a/metric_log_store.h"
|
||||
#include "brave/components/p3a/p3a_service.h"
|
||||
#include "brave/components/p3a/rotation_scheduler.h"
|
||||
#include "brave/components/skus/browser/skus_utils.h"
|
||||
#include "brave/ios/browser/brave_stats/brave_stats_prefs.h"
|
||||
#include "components/pref_registry/pref_registry_syncable.h"
|
||||
|
||||
namespace brave {
|
||||
|
||||
void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
brave_ads::RegisterProfilePrefs(registry);
|
||||
brave_ads::RegisterProfilePrefsForMigration(registry);
|
||||
brave_rewards::RegisterProfilePrefs(registry);
|
||||
brave_rewards::RegisterProfilePrefsForMigration(registry);
|
||||
brave_sync::Prefs::RegisterProfilePrefs(registry);
|
||||
brave_wallet::RegisterProfilePrefs(registry);
|
||||
brave_wallet::RegisterProfilePrefsForMigration(registry);
|
||||
de_amp::RegisterProfilePrefs(registry);
|
||||
debounce::DebounceService::RegisterProfilePrefs(registry);
|
||||
ai_chat::prefs::RegisterProfilePrefs(registry);
|
||||
ai_chat::ModelService::RegisterProfilePrefs(registry);
|
||||
omnibox::RegisterBraveProfilePrefs(registry);
|
||||
brave_news::prefs::RegisterProfilePrefs(registry);
|
||||
ntp_background_images::RegisterProfilePrefs(registry);
|
||||
ntp_background_images::RegisterProfilePrefsForMigration(registry);
|
||||
brave_shields::RegisterShieldsP3AProfilePrefs(registry);
|
||||
brave_shields::RegisterShieldsP3AProfilePrefsForMigration(registry);
|
||||
}
|
||||
|
||||
void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
|
||||
brave_stats::RegisterLocalStatePrefs(registry);
|
||||
brave_wallet::RegisterLocalStatePrefs(registry);
|
||||
brave_wallet::RegisterLocalStatePrefsForMigration(registry);
|
||||
decentralized_dns::RegisterLocalStatePrefs(registry);
|
||||
skus::RegisterLocalStatePrefs(registry);
|
||||
p3a::P3AService::RegisterPrefs(registry, false);
|
||||
p3a::MetricLogStore::RegisterLocalStatePrefsForMigration(registry);
|
||||
p3a::RotationScheduler::RegisterLocalStatePrefsForMigration(registry);
|
||||
ntp_background_images::NTPBackgroundImagesService::RegisterLocalStatePrefs(
|
||||
registry);
|
||||
brave_l10n::RegisterLocalStatePrefsForMigration(registry);
|
||||
ai_chat::prefs::RegisterLocalStatePrefs(registry);
|
||||
ai_chat::AIChatMetrics::RegisterPrefs(registry);
|
||||
ntp_background_images::RegisterLocalStatePrefs(registry);
|
||||
brave_shields::RegisterShieldsP3ALocalPrefs(registry);
|
||||
|
||||
// brave_shields
|
||||
// Note this can be removed when we use the entire
|
||||
// `brave_shields:AdBlockService` And we can call its
|
||||
// `RegisterPrefsForAdBlockService`
|
||||
registry->RegisterDictionaryPref(
|
||||
brave_shields::prefs::kAdBlockRegionalFilters);
|
||||
registry->RegisterDictionaryPref(
|
||||
brave_shields::prefs::kAdBlockListSubscriptions);
|
||||
registry->RegisterBooleanPref(
|
||||
brave_shields::prefs::kAdBlockCheckedAllDefaultRegions, false);
|
||||
registry->RegisterBooleanPref(
|
||||
brave_shields::prefs::kAdBlockCheckedDefaultRegion, false);
|
||||
}
|
||||
|
||||
void MigrateObsoleteProfilePrefs(PrefService* prefs) {
|
||||
brave_ads::MigrateObsoleteProfilePrefs(prefs);
|
||||
brave_wallet::MigrateObsoleteProfilePrefs(prefs);
|
||||
ntp_background_images::MigrateObsoleteProfilePrefs(prefs);
|
||||
}
|
||||
|
||||
void MigrateObsoleteLocalStatePrefs(PrefService* prefs) {
|
||||
p3a::MetricLogStore::MigrateObsoleteLocalStatePrefs(prefs);
|
||||
p3a::RotationScheduler::MigrateObsoleteLocalStatePrefs(prefs);
|
||||
}
|
||||
|
||||
} // namespace brave
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/ios/chrome/browser/shared/model/prefs/BUILD.gn b/ios/chrome/browser/shared/model/prefs/BUILD.gn
|
||||
index e725f6463af098489c7c0fe447138ce7fa9e70b9..23d96689ce270b3c437e98599cfc6785d479958f 100644
|
||||
--- a/ios/chrome/browser/shared/model/prefs/BUILD.gn
|
||||
+++ b/ios/chrome/browser/shared/model/prefs/BUILD.gn
|
||||
@@ -150,6 +150,7 @@ source_set("browser_prefs") {
|
||||
if (target_environment != "catalyst") {
|
||||
deps += [ "//ios/chrome/browser/default_browser/model/default_status" ]
|
||||
}
|
||||
+ import("//brave/chromium_src/ios/chrome/browser/shared/model/prefs/sources.gni") deps += brave_browser_prefs_deps
|
||||
}
|
||||
|
||||
source_set("unit_tests") {
|
||||
Reference in New Issue
Block a user