diff --git a/browser/autoplay/autoplay_permission_context_unittest.cc b/browser/autoplay/autoplay_permission_context_unittest.cc index 9b5cd5b0f983..fbedba51246f 100644 --- a/browser/autoplay/autoplay_permission_context_unittest.cc +++ b/browser/autoplay/autoplay_permission_context_unittest.cc @@ -77,8 +77,6 @@ class AutoplayPermissionContextTests : public ChromeRenderViewHostTestHarness { auto prefs = std::make_unique(); RegisterUserProfilePrefs(prefs->registry()); - prefs->registry()-> - RegisterBooleanPref(kGoogleLoginControlType, true); builder.SetPrefService(std::move(prefs)); return builder.Build().release(); } diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 2a2273f87b6e..a421d555b2be 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -5,10 +5,7 @@ #include "brave/browser/brave_profile_prefs.h" -#include "brave/browser/themes/brave_theme_service.h" -#include "brave/browser/tor/buildflags.h" #include "brave/common/pref_names.h" -#include "brave/components/brave_rewards/browser/rewards_service.h" #include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h" #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" #include "chrome/browser/net/prediction_options.h" @@ -18,7 +15,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/safe_browsing/common/safe_browsing_prefs.h" #include "components/signin/core/browser/signin_pref_names.h" -#include "components/spellcheck/browser/pref_names.h" #include "components/sync/base/pref_names.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/feature_switch.h" @@ -32,30 +28,18 @@ #include "brave/components/brave_webtorrent/browser/webtorrent_util.h" #endif -#if BUILDFLAG(ENABLE_TOR) -#include "brave/browser/tor/tor_profile_service.h" -#endif - using extensions::FeatureSwitch; namespace brave { void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { - brave_rewards::RewardsService::RegisterProfilePrefs(registry); brave_shields::BraveShieldsWebContentsObserver::RegisterProfilePrefs( registry); // appearance -#if !defined(OS_ANDROID) - BraveThemeService::RegisterProfilePrefs(registry); -#endif registry->RegisterBooleanPref(kLocationBarIsWide, false); registry->RegisterBooleanPref(kHideBraveRewardsButton, false); -#if BUILDFLAG(ENABLE_TOR) - tor::TorProfileService::RegisterProfilePrefs(registry); -#endif - registry->RegisterBooleanPref(kWidevineOptedIn, false); #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) BraveWidevineBundleManager::RegisterProfilePrefs(registry); @@ -76,11 +60,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { webtorrent::RegisterProfilePrefs(registry); #endif -#if defined(OS_LINUX) - // Use brave theme by default instead of gtk theme. - registry->SetDefaultPrefValue(prefs::kUsesSystemTheme, base::Value(false)); -#endif - // Hangouts registry->RegisterBooleanPref(kHangoutsEnabled, true); @@ -96,9 +75,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { FeatureSwitch::load_media_router_component_extension()->IsEnabled()); #endif - // No sign into Brave functionality - registry->SetDefaultPrefValue(prefs::kSigninAllowed, base::Value(false)); - // Restore last profile on restart registry->SetDefaultPrefValue( prefs::kRestoreOnStartup, @@ -111,10 +87,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->SetDefaultPrefValue(prefs::kAlternateErrorPagesEnabled, base::Value(false)); - // Disable spell check service - registry->SetDefaultPrefValue( - spellcheck::prefs::kSpellCheckUseSpellingService, base::Value(false)); - // Disable safebrowsing reporting registry->SetDefaultPrefValue( prefs::kSafeBrowsingExtendedReportingOptInAllowed, base::Value(false)); @@ -131,12 +103,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Make sync managed to dsiable some UI after password saving. registry->SetDefaultPrefValue(syncer::prefs::kSyncManaged, base::Value(true)); - // Make sure sign into Brave is not enabled - // The older kSigninAllowed is deprecated and only in use in Android until - // C71. - registry->SetDefaultPrefValue(prefs::kSigninAllowedOnNextStartup, - base::Value(false)); - // Disable cloud print // Cloud Print: Don't allow this browser to act as Cloud Print server registry->SetDefaultPrefValue(prefs::kCloudPrintProxyEnabled, diff --git a/browser/profiles/tor_unittest_profile_manager.cc b/browser/profiles/tor_unittest_profile_manager.cc index 25fee9831d9b..059a2b53b571 100644 --- a/browser/profiles/tor_unittest_profile_manager.cc +++ b/browser/profiles/tor_unittest_profile_manager.cc @@ -12,8 +12,6 @@ #include "base/threading/thread_task_runner_handle.h" #include "brave/browser/profiles/brave_profile_manager.h" #include "brave/browser/tor/tor_profile_service.h" -#include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" -#include "brave/components/brave_webtorrent/browser/webtorrent_util.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/test/base/testing_profile.h" @@ -63,9 +61,6 @@ Profile* TorUnittestProfileManager::CreateTorProfile( factory.CreateSyncable(registry.get())); RegisterUserProfilePrefs(registry.get()); tor::TorProfileService::RegisterProfilePrefs(registry.get()); -#if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT) - webtorrent::RegisterProfilePrefs(registry.get()); -#endif profile_builder.SetPrefService(std::move(prefs)); profile_builder.SetPath(path); profile_builder.SetDelegate(delegate); diff --git a/chromium_src/chrome/browser/prefs/browser_prefs.cc b/chromium_src/chrome/browser/prefs/browser_prefs.cc index 1e3f1a8d1269..d8b472bcc2e9 100644 --- a/chromium_src/chrome/browser/prefs/browser_prefs.cc +++ b/chromium_src/chrome/browser/prefs/browser_prefs.cc @@ -1,2 +1,8 @@ +/* Copyright (c) 2019 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 http://mozilla.org/MPL/2.0/. */ + +#include "brave/browser/brave_profile_prefs.h" #include "brave/browser/brave_local_state_prefs.h" #include "../../../../chrome/browser/prefs/browser_prefs.cc" diff --git a/chromium_src/chrome/browser/profiles/pref_service_builder_utils.cc b/chromium_src/chrome/browser/profiles/pref_service_builder_utils.cc new file mode 100644 index 000000000000..b4ffd6dd94c0 --- /dev/null +++ b/chromium_src/chrome/browser/profiles/pref_service_builder_utils.cc @@ -0,0 +1,55 @@ +/* Copyright (c) 2019 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 http://mozilla.org/MPL/2.0/. */ + +#include "chrome/browser/profiles/pref_service_builder_utils.h" + +#define RegisterProfilePrefs RegisterProfilePrefs_ChromiumImpl +#include "../../../../../chrome/browser/profiles/pref_service_builder_utils.cc" +#undef RegisterProfilePrefs + +#include "brave/browser/brave_profile_prefs.h" +#include "brave/browser/themes/brave_theme_service.h" +#include "brave/browser/tor/buildflags.h" +#include "brave/common/pref_names.h" +#include "brave/components/brave_rewards/browser/rewards_service.h" +#include "chrome/common/pref_names.h" +#include "components/spellcheck/browser/pref_names.h" + +#if BUILDFLAG(ENABLE_TOR) +#include "brave/browser/tor/tor_profile_service.h" +#endif + +// Prefs for KeyedService +void RegisterProfilePrefs(bool is_signin_profile, + const std::string& locale, + user_prefs::PrefRegistrySyncable* registry) { + RegisterProfilePrefs_ChromiumImpl(is_signin_profile, locale, registry); + + // appearance +#if !defined(OS_ANDROID) + BraveThemeService::RegisterProfilePrefs(registry); +#endif + +#if BUILDFLAG(ENABLE_TOR) + tor::TorProfileService::RegisterProfilePrefs(registry); +#endif + + brave_rewards::RewardsService::RegisterProfilePrefs(registry); + + // Disable spell check service + registry->SetDefaultPrefValue( + spellcheck::prefs::kSpellCheckUseSpellingService, base::Value(false)); + + // Make sure sign into Brave is not enabled + // The older kSigninAllowed is deprecated and only in use in Android until + // C71. + registry->SetDefaultPrefValue(prefs::kSigninAllowedOnNextStartup, + base::Value(false)); + +#if defined(OS_LINUX) + // Use brave theme by default instead of gtk theme. + registry->SetDefaultPrefValue(prefs::kUsesSystemTheme, base::Value(false)); +#endif +} diff --git a/chromium_src/chrome/common/pref_names.h b/chromium_src/chrome/common/pref_names.h index ecf039226c5c..8b12f1a2f1ac 100644 --- a/chromium_src/chrome/common/pref_names.h +++ b/chromium_src/chrome/common/pref_names.h @@ -1,4 +1,12 @@ -#include "../../../chrome/common/pref_names.h" +/* Copyright (c) 2019 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 http://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_CHROME_COMMON_PREF_NAMES_H_ +#define BRAVE_CHROMIUM_SRC_CHROME_COMMON_PREF_NAMES_H_ + +#include "../../../../chrome/common/pref_names.h" namespace prefs { @@ -8,3 +16,5 @@ extern const char kImportDialogLedger[]; extern const char kImportDialogWindows[]; } // namespace prefs + +#endif // BRAVE_CHROMIUM_SRC_CHROME_COMMON_PREF_NAMES_H_ diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 976faa7adf74..57f85203cf1a 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 50312cdb0324e3dad18c77c96e5e609bfb259541..ed0ab71e9e08494abb5016bcb4e1fce6f852ea24 100644 +index 50312cdb0324e3dad18c77c96e5e609bfb259541..2298f9b60d2718d82e721dc8483b114931a30d0d 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -658,6 +658,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { @@ -10,3 +10,11 @@ index 50312cdb0324e3dad18c77c96e5e609bfb259541..ed0ab71e9e08494abb5016bcb4e1fce6 } // Register prefs applicable to all profiles. +@@ -908,6 +909,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, + #endif + + RegisterProfilePrefsForMigration(registry); ++ brave::RegisterProfilePrefs(registry); + } + + void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index e04ed4a31c75..ad4ce212270f 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index 71619ca3d5271b0f813110dce0e5570b6eebdda7..a9c1f8ec99aafa581c7fc8261e470261323c6492 100644 +index 71619ca3d5271b0f813110dce0e5570b6eebdda7..97003f2bc6f1141ae49dc2a2ac58e5f861fd0615 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -34,6 +34,7 @@ @@ -10,13 +10,3 @@ index 71619ca3d5271b0f813110dce0e5570b6eebdda7..a9c1f8ec99aafa581c7fc8261e470261 #include "build/build_config.h" #include "chrome/browser/background/background_contents_service_factory.h" #include "chrome/browser/background_fetch/background_fetch_delegate_factory.h" -@@ -508,6 +509,9 @@ ProfileImpl::ProfileImpl( - LoadPrefsForNormalStartup(async_prefs); - #endif - -+// Done here instead of browser_prefs.cc so it can override default prefs -+brave::RegisterProfilePrefs(pref_registry_.get()); -+ - content::BrowserContext::Initialize(this, path_); - - // Register on BrowserContext.