Patches for v132 (not modified, line changes)
This commit is contained in:
@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -8408,6 +8408,12 @@ static_library("browser") {
|
||||
@@ -8407,6 +8407,12 @@ static_library("browser") {
|
||||
deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
if (enable_compose) {
|
||||
sources += [
|
||||
"compose/chrome_compose_client.cc",
|
||||
@@ -8423,7 +8429,6 @@ static_library("browser") {
|
||||
@@ -8422,7 +8428,6 @@ static_library("browser") {
|
||||
]
|
||||
|
||||
deps += [
|
||||
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
"//chrome/common/compose",
|
||||
"//chrome/common/compose:mojo_bindings",
|
||||
"//components/autofill/content/browser:browser",
|
||||
@@ -8870,7 +8875,7 @@ source_set("font_pref") {
|
||||
@@ -8869,7 +8874,7 @@ source_set("font_pref") {
|
||||
deps = [ "//chrome/common" ]
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/navigation_predictor/navigation_predictor_metrics_do
|
||||
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
|
||||
--- a/chrome/browser/safe_browsing/BUILD.gn
|
||||
+++ b/chrome/browser/safe_browsing/BUILD.gn
|
||||
@@ -218,6 +218,7 @@ static_library("safe_browsing") {
|
||||
@@ -217,6 +217,7 @@ static_library("safe_browsing") {
|
||||
"//components/webdata/common",
|
||||
"//content/public/browser",
|
||||
"//services/preferences/public/mojom:mojom",
|
||||
|
||||
@@ -42,7 +42,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
|
||||
}
|
||||
|
||||
private SiteSettingsCategory getWarningCategory() {
|
||||
@@ -1280,12 +1273,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
|
||||
@@ -1282,12 +1275,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
|
||||
@Nullable
|
||||
Integer currentValue =
|
||||
mSite.getContentSetting(browserContextHandle, ContentSettingsType.JAVASCRIPT);
|
||||
@@ -62,7 +62,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
|
||||
}
|
||||
// Not possible to embargo JAVASCRIPT.
|
||||
setupContentSettingsPreference(
|
||||
@@ -1295,6 +1289,29 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
|
||||
@@ -1297,6 +1291,29 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
|
||||
isOneTime(ContentSettingsType.JAVASCRIPT));
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
|
||||
/**
|
||||
* Updates the ads list preference based on whether the site is a candidate for blocking. This
|
||||
* has some custom behavior.
|
||||
@@ -1313,9 +1330,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
|
||||
@@ -1315,9 +1332,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
|
||||
}
|
||||
// If the ad blocker is activated, then this site will have ads blocked unless there is an
|
||||
// explicit permission disallowing the blocking.
|
||||
|
||||
@@ -132,7 +132,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2538,6 +2538,18 @@ static_library("browser") {
|
||||
@@ -2537,6 +2537,18 @@ static_library("browser") {
|
||||
}
|
||||
|
||||
if (is_android) {
|
||||
|
||||
Reference in New Issue
Block a user