v115 patches (line changes)

This commit is contained in:
Carmelo Messina
2023-07-14 12:08:22 +02:00
parent 6c63c83772
commit 5f0a60b101
5 changed files with 8 additions and 8 deletions
@@ -3414,7 +3414,7 @@ diff --git a/components/adblock/core/converter/flatbuffer_converter.cc b/compone
diff --git a/components/adblock/core/converter/parser/metadata.cc b/components/adblock/core/converter/parser/metadata.cc
--- a/components/adblock/core/converter/parser/metadata.cc
+++ b/components/adblock/core/converter/parser/metadata.cc
@@ -58,13 +58,6 @@ absl::optional<Metadata> Metadata::FromStream(std::istream& filter_stream) {
@@ -57,13 +57,6 @@ absl::optional<Metadata> Metadata::FromStream(std::istream& filter_stream) {
if (key == "homepage") {
homepage = value;
} else if (key == "redirect") {
@@ -3428,7 +3428,7 @@ diff --git a/components/adblock/core/converter/parser/metadata.cc b/components/a
} else if (key == "title") {
title = value;
} else if (key == "version") {
@@ -107,6 +100,7 @@ Metadata::~Metadata() = default;
@@ -106,6 +99,7 @@ Metadata::~Metadata() = default;
// static
bool Metadata::IsValidAdblockHeader(const std::string& adblock_header) {
@@ -3436,7 +3436,7 @@ diff --git a/components/adblock/core/converter/parser/metadata.cc b/components/a
static re2::RE2 adblock_header_re("^\\[Adblock.*\\]");
std::string adblock_header_trimmed;
@@ -131,7 +125,7 @@ base::TimeDelta Metadata::ParseExpirationTime(
@@ -130,7 +124,7 @@ base::TimeDelta Metadata::ParseExpirationTime(
if (!re2::RE2::FullMatch(expiration_value, expiration_time_re,
&expiration_time, &expiration_unit)) {
@@ -4198,7 +4198,7 @@ diff --git a/components/adblock/core/subscription/subscription_persistent_metada
namespace adblock {
@@ -146,6 +147,12 @@ void SubscriptionPersistentMetadataImpl::UpdatePrefs() {
prefs_->Set(prefs::kSubscriptionMetadata, std::move(dict));
prefs_->SetDict(prefs::kSubscriptionMetadata, std::move(dict));
}
+bool SubscriptionPersistentMetadataImpl::AllowPrivilegedFilters(
@@ -32,7 +32,7 @@ fonts-fingerprint-mitigation flag, which is active by default.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -9990,6 +9990,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9992,6 +9992,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kClipboardUnsanitizedContentDescription, kOsAll,
FEATURE_VALUE_TYPE(blink::features::kClipboardUnsanitizedContent)},
@@ -12,7 +12,7 @@ Subject: WIN ADDTO Add bookmark import/export actions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -9449,11 +9449,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9451,11 +9451,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)},
#endif
@@ -9,7 +9,7 @@ Subject: WIN ADDTO Restore Search Ready Omnibox flag
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -9421,9 +9421,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9423,9 +9423,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kDesksTemplatesDescription, kOsCrOS,
FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)},
#endif
+1 -1
View File
@@ -114,7 +114,7 @@ diff --git a/base/win/win_util.cc b/base/win/win_util.cc
diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
--- a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
+++ b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
@@ -55,6 +55,11 @@ static jboolean
@@ -56,6 +56,11 @@ static jboolean
JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy(
JNIEnv* env) {
const PrefService* local_state = g_browser_process->local_state();