patches for 114

This commit is contained in:
Carmelo Messina
2023-05-30 20:27:35 +02:00
parent deb791bec6
commit 731b314e82
13 changed files with 29 additions and 30 deletions
+1 -1
View File
@@ -52,7 +52,7 @@ in services/firewall/tools/rules.xml
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2408,6 +2408,7 @@ static_library("browser") {
@@ -2418,6 +2418,7 @@ static_library("browser") {
"//third_party/ungoogled:switches",
"//services/device/public/mojom",
"//services/device/public/mojom:usb",
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc
--- a/chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -118,6 +118,7 @@ scoped_refptr<RefcountedKeyedService>
@@ -120,6 +120,7 @@ scoped_refptr<RefcountedKeyedService>
bool always_incognito_enabled = false;
bool force_save_site_settings = false;
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
PrefService* prefService = original_profile->GetPrefs();
if (prefService->GetBoolean(prefs::kAlwaysIncognitoEnabled)) {
always_incognito_enabled = true;
@@ -127,6 +128,7 @@ scoped_refptr<RefcountedKeyedService>
@@ -129,6 +130,7 @@ scoped_refptr<RefcountedKeyedService>
profile = original_profile;
force_save_site_settings = true;
}
@@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -122,6 +122,10 @@ BASE_FEATURE(kEnableCrossSiteFlagNetworkIsolationKey, // must be
@@ -126,6 +126,10 @@ BASE_FEATURE(kEnableCrossSiteFlagNetworkIsolationKey, // must be
"EnableCrossSiteFlagNetworkIsolationKey", // disabled
base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
@@ -126,7 +126,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -105,6 +105,9 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -104,6 +104,9 @@ public class PrivacySettings extends PreferenceFragmentCompat
private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher;
private Profile mProfile;
@@ -136,7 +136,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
PrivacyPreferencesManagerImpl privacyPrefManager =
@@ -246,6 +249,9 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -245,6 +248,9 @@ public class PrivacySettings extends PreferenceFragmentCompat
new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
}
@@ -146,7 +146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
@@ -260,6 +266,14 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -259,6 +265,14 @@ public class PrivacySettings extends PreferenceFragmentCompat
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -161,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
}
return true;
}
@@ -283,6 +297,16 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -282,6 +296,16 @@ public class PrivacySettings extends PreferenceFragmentCompat
UserPrefs.get(mProfile).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
}
@@ -245,7 +245,7 @@ diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -213,7 +213,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
@@ -217,7 +217,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
#if BUILDFLAG(ENABLE_REPORTING)
BASE_FEATURE(kDocumentReporting,
"DocumentReporting",
+2 -2
View File
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -62,6 +62,14 @@ const base::FeatureParam<base::TimeDelta> kUseDnsHttpsSvcbSecureExtraTimeMin{
@@ -66,6 +66,14 @@ const base::FeatureParam<base::TimeDelta> kUseDnsHttpsSvcbSecureExtraTimeMin{
&kUseDnsHttpsSvcb, "UseDnsHttpsSvcbSecureExtraTimeMin",
base::Milliseconds(5)};
@@ -107,7 +107,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc
diff --git a/net/base/features.h b/net/base/features.h
--- a/net/base/features.h
+++ b/net/base/features.h
@@ -96,6 +96,12 @@ NET_EXPORT BASE_DECLARE_FEATURE(kSHA1ServerSignature);
@@ -99,6 +99,12 @@ NET_EXPORT BASE_DECLARE_FEATURE(kSHA1ServerSignature);
// Enables TLS 1.3 early data.
NET_EXPORT BASE_DECLARE_FEATURE(kEnableTLS13EarlyData);
+1 -1
View File
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -83,12 +83,12 @@ BASE_FEATURE(kEnableTLS13EarlyData,
@@ -87,12 +87,12 @@ BASE_FEATURE(kEnableTLS13EarlyData,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kEncryptedClientHello,
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -139,8 +139,8 @@ BASE_FEATURE(kTLS13KeyUpdate,
@@ -143,8 +143,8 @@ BASE_FEATURE(kTLS13KeyUpdate,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kPermuteTLSExtensions,
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -90,37 +90,37 @@ BASE_FEATURE(kSplitCacheByIncludeCredentials,
@@ -94,37 +94,37 @@ BASE_FEATURE(kSplitCacheByIncludeCredentials,
"SplitCacheByIncludeCredentials",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -265,8 +265,8 @@ BASE_FEATURE(kBlockSetCookieHeader,
@@ -269,8 +269,8 @@ BASE_FEATURE(kBlockSetCookieHeader,
// Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.)
// by the top level site to reduce fingerprinting.
BASE_FEATURE(kThirdPartyStoragePartitioning,
@@ -7,9 +7,9 @@ Search suggestions, autofill assistant and contextual search
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../java/res/xml/privacy_preferences.xml | 13 ++++++++
.../privacy/settings/PrivacySettings.java | 33 +++++++++++++++++++
.../privacy/settings/PrivacySettings.java | 32 +++++++++++++++++++
.../strings/android_chrome_strings.grd | 4 +++
3 files changed, 50 insertions(+)
3 files changed, 49 insertions(+)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
@@ -51,7 +51,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
/**
* Fragment to keep track of the all the privacy related preferences.
*/
@@ -77,6 +84,17 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -77,6 +84,16 @@ public class PrivacySettings extends PreferenceFragmentCompat
private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
@@ -63,13 +63,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
+ private @Nullable Preference mContextualSearch;
+ private final SharedPreferencesManager mSharedPreferencesManager =
+ SharedPreferencesManager.getInstance();
+ private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
+
+ private ManagedPreferenceDelegate mManagedPreferenceDelegate;
private IncognitoLockSettings mIncognitoLockSettings;
private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher;
private Profile mProfile;
@@ -139,6 +157,16 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -139,6 +156,16 @@ public class PrivacySettings extends PreferenceFragmentCompat
setHasOptionsMenu(true);
@@ -86,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
ChromeSwitchPreference canMakePaymentPref =
(ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
canMakePaymentPref.setOnPreferenceChangeListener(this);
@@ -219,6 +247,9 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -219,6 +246,9 @@ public class PrivacySettings extends PreferenceFragmentCompat
UserPrefs.get(mProfile).setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
} else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
UserPrefs.get(mProfile).setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue);
@@ -96,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
}
return true;
}
@@ -233,6 +264,8 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -233,6 +263,8 @@ public class PrivacySettings extends PreferenceFragmentCompat
* Updates the preferences.
*/
public void updatePreferences() {
@@ -180,7 +180,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
private static final String PREF_PROXY_OPTIONS = "proxy";
@@ -354,6 +356,10 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -353,6 +355,10 @@ public class PrivacySettings extends PreferenceFragmentCompat
: R.string.text_off);
}
@@ -1084,7 +1084,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"after_startup_task_utils.cc",
"after_startup_task_utils.h",
"app_mode/app_mode_utils.cc",
@@ -2016,6 +2039,8 @@ static_library("browser") {
@@ -2026,6 +2049,8 @@ static_library("browser") {
"//chrome/common/notifications",
"//chrome/installer/util:with_no_strings",
"//chrome/services/speech/buildflags",
@@ -1093,7 +1093,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/assist_ranker",
"//components/autofill/content/browser",
"//components/autofill/core/browser",
@@ -2534,6 +2559,18 @@ static_library("browser") {
@@ -2544,6 +2569,18 @@ static_library("browser") {
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -1112,7 +1112,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/android_theme_resources.h",
"android/autocomplete/tab_matcher_android.cc",
"android/autocomplete/tab_matcher_android.h",
@@ -3253,6 +3290,7 @@ static_library("browser") {
@@ -3263,6 +3300,7 @@ static_library("browser") {
"webauthn/android/webauthn_request_delegate_android.cc",
"webauthn/android/webauthn_request_delegate_android.h",
]
@@ -7270,7 +7270,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
#include "chrome/browser/autocomplete/document_suggestions_service_factory.h"
#include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
@@ -211,6 +224,9 @@
@@ -212,6 +225,9 @@
#include "services/network/public/cpp/features.h"
#if BUILDFLAG(IS_ANDROID)
@@ -7280,7 +7280,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/android/explore_sites/explore_sites_service_factory.h"
#include "chrome/browser/android/reading_list/reading_list_manager_factory.h"
#include "chrome/browser/android/reading_list/reading_list_notification_service_factory.h"
@@ -631,9 +647,21 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -632,9 +648,21 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
ExitTypeServiceFactory::GetInstance();
#endif
@@ -7506,7 +7506,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper.h"
#include "chrome/browser/browser_process.h"
@@ -101,6 +109,7 @@
@@ -102,6 +110,7 @@
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_isolated_world_ids.h"
#include "chrome/common/chrome_switches.h"
@@ -7514,7 +7514,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "components/autofill/content/browser/content_autofill_client.h"
#include "components/autofill/content/browser/content_autofill_driver_factory.h"
#include "components/autofill/core/browser/browser_autofill_manager.h"
@@ -320,6 +329,16 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -321,6 +330,16 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
web_contents, optimization_guide_decider, about_this_site_service);
}
#endif