v109 fix Modify default preferences

no code changes, simply moved content_features.cc to features.cc
This commit is contained in:
Carmelo Messina 2023-01-06 14:53:55 +01:00
parent 6c61862192
commit 9af802b19a
No known key found for this signature in database
GPG key ID: 968894BE688289FD

View file

@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/payments/core/payment_prefs.cc | 2 +- components/payments/core/payment_prefs.cc | 2 +-
.../core/common/safe_browsing_prefs.cc | 4 ++-- .../core/common/safe_browsing_prefs.cc | 4 ++--
.../primary_account_manager.cc | 4 ++-- .../primary_account_manager.cc | 4 ++--
content/public/common/content_features.cc | 4 ++-- third_party/blink/common/features.cc | 4 ++--
19 files changed, 73 insertions(+), 20 deletions(-) 19 files changed, 73 insertions(+), 20 deletions(-)
create mode 100644 components/bookmarks/browser/features.cc create mode 100644 components/bookmarks/browser/features.cc
create mode 100644 components/bookmarks/browser/features.h create mode 100644 components/bookmarks/browser/features.h
@ -36,9 +36,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "components/autofill_assistant/browser/features.h" #include "components/autofill_assistant/browser/features.h"
+#include "components/bookmarks/browser/features.h" +#include "components/bookmarks/browser/features.h"
#include "components/browser_sync/browser_sync_switches.h" #include "components/browser_sync/browser_sync_switches.h"
#include "components/browser_ui/settings/android/features.h"
#include "components/browser_ui/site_settings/android/features.h" #include "components/browser_ui/site_settings/android/features.h"
#include "components/browsing_data/core/features.h" @@ -6051,6 +6052,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5937,6 +5938,11 @@ const FeatureEntry kFeatureEntries[] = {
reading_list::switches::kReadLaterReminderNotification)}, reading_list::switches::kReadLaterReminderNotification)},
#endif #endif
@ -53,10 +53,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
--- a/chrome/browser/background/background_mode_manager.cc --- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc
@@ -377,7 +377,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { @@ -371,7 +371,7 @@ BackgroundModeManager::~BackgroundModeManager() {
registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); // static
#endif void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
- registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true); - registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false); + registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
} }
@ -65,7 +65,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1435,7 +1435,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( @@ -1511,7 +1511,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
void ChromeContentBrowserClient::RegisterProfilePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) { user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@ -77,7 +77,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -2920,6 +2920,10 @@ const char kTabToGTSAnimationAndroidDescription[] = @@ -2890,6 +2890,10 @@ const char kTabToGTSAnimationAndroidDescription[] =
"Allows users to see an animation when entering or leaving the " "Allows users to see an animation when entering or leaving the "
"Grid Tab Switcher on phones."; "Grid Tab Switcher on phones.";
@ -91,7 +91,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -1641,6 +1641,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[]; @@ -1630,6 +1630,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[];
extern const char kTabToGTSAnimationAndroidName[]; extern const char kTabToGTSAnimationAndroidName[];
extern const char kTabToGTSAnimationAndroidDescription[]; extern const char kTabToGTSAnimationAndroidDescription[];
@ -249,23 +249,23 @@ new file mode 100644
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
--- a/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -311,7 +311,7 @@ void ContentSettingsRegistry::Init() { @@ -262,7 +262,7 @@ void ContentSettingsRegistry::Init() {
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync", Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync",
- CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE, - CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE,
+ CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE, + CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,
AllowlistedSchemes(), /*allowlisted_schemes=*/{},
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK},
WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
@@ -411,7 +411,7 @@ void ContentSettingsRegistry::Init() { @@ -362,7 +362,7 @@ void ContentSettingsRegistry::Init() {
// TODO(crbug.com/904439): Update this to "SECURE_ONLY" once // TODO(crbug.com/904439): Update this to "SECURE_ONLY" once
// DeviceOrientationEvents and DeviceMotionEvents are only fired in secure // DeviceOrientationEvents and DeviceMotionEvents are only fired in secure
// contexts. // contexts.
- Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_ALLOW, - Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_ALLOW,
+ Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_BLOCK, + Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_BLOCK,
WebsiteSettingsInfo::UNSYNCABLE, AllowlistedSchemes(), WebsiteSettingsInfo::UNSYNCABLE, /*allowlisted_schemes=*/{},
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK},
WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
--- a/components/content_settings/core/browser/cookie_settings.cc --- a/components/content_settings/core/browser/cookie_settings.cc
@ -309,7 +309,7 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/compo
diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
--- a/components/signin/internal/identity_manager/primary_account_manager.cc --- a/components/signin/internal/identity_manager/primary_account_manager.cc
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc
@@ -50,9 +50,9 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -51,9 +51,9 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
std::string()); std::string());
registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string()); registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string());
registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false); registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false);
@ -321,10 +321,10 @@ diff --git a/components/signin/internal/identity_manager/primary_account_manager
registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false); registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false);
} }
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/content/public/common/content_features.cc --- a/third_party/blink/common/features.cc
+++ b/content/public/common/content_features.cc +++ b/third_party/blink/common/features.cc
@@ -540,8 +540,8 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList"; @@ -1720,8 +1720,8 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread,
// the attribute. Note: At present, only iframes with origin-restricted // the attribute. Note: At present, only iframes with origin-restricted
// sandboxes are isolated. // sandboxes are isolated.
BASE_FEATURE(kIsolateSandboxedIframes, BASE_FEATURE(kIsolateSandboxedIframes,