Patches for v136 (no changes)

This commit is contained in:
Carmelo Messina
2025-05-02 16:46:59 +02:00
parent 05c139d21b
commit e30c94bdd5
6 changed files with 9 additions and 9 deletions
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
if (FirstRunStatus.getFirstRunFlowComplete()
&& !isEmptyUrl(mParams.getUrl())
&& UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
@@ -735,6 +738,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -734,6 +737,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
getProfile(),
false);
});
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -787,7 +787,6 @@ if (current_toolchain == default_toolchain) {
@@ -789,7 +789,6 @@ if (current_toolchain == default_toolchain) {
"//components/offline_pages/core:offline_page_model_enums_java",
"//components/sharing_message:sharing_dialog_type_generated_enum",
"//components/sharing_message:sharing_send_message_result_generated_enum",
@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -3013,7 +3013,6 @@ generate_jni("chrome_jni_headers") {
@@ -3015,7 +3015,6 @@ generate_jni("chrome_jni_headers") {
"../browser/share/android/java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextBridge.java",
"../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
"../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
@@ -298,7 +298,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
return;
}
@@ -983,15 +984,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) {
@@ -981,15 +982,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) {
}
}
@@ -113,7 +113,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/android_autofill/browser:java",
"//components/autofill/android:autofill_features_java",
"//components/autofill/android:autofill_java",
@@ -1336,6 +1341,7 @@ if (current_toolchain == default_toolchain) {
@@ -1338,6 +1343,7 @@ if (current_toolchain == default_toolchain) {
"javatests:chrome_test_java_org.chromium.chrome.browser.toolbar",
"javatests:chrome_test_java_org.chromium.chrome.browser.webapps",
"javatests:chrome_test_java_various",
@@ -121,7 +121,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/android/browserservices/verification:javatests",
"//chrome/browser/android/httpclient:javatests",
"//chrome/browser/android/metrics:ukm_javatests",
@@ -1405,6 +1411,7 @@ if (current_toolchain == default_toolchain) {
@@ -1407,6 +1413,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/test/data/translate/",
"//chrome/test/data/webauthn/",
"//chrome/test/media_router/resources/",
@@ -129,7 +129,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/test/data/autofill/",
"//components/test/data/payments/",
"//content/test/data/browsing_data/",
@@ -3200,6 +3207,12 @@ generate_jni("chrome_jni_headers") {
@@ -3202,6 +3209,12 @@ generate_jni("chrome_jni_headers") {
sources += [ "java/src/org/chromium/chrome/browser/media/MediaCapturePickerDialogBridge.java" ]
}
@@ -142,7 +142,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
# Used for testing only, should not be shipped to end users.
if (enable_offline_pages_harness) {
sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ]
@@ -3291,6 +3304,7 @@ group("jni_headers") {
@@ -3293,6 +3306,7 @@ group("jni_headers") {
"//chrome/browser/ui/messages/android:jni_headers",
"//chrome/browser/util:jni_headers",
"//chrome/browser/webauthn/android:jni_headers",
@@ -250,7 +250,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
}
android_resources("java_overlay_resources") {
@@ -777,6 +781,10 @@ if (current_toolchain == default_toolchain) {
@@ -779,6 +783,10 @@ if (current_toolchain == default_toolchain) {
"//url/mojom:url_mojom_origin_java",
]