From ca7e02c546bf034b5bb4e2ace3b33b60d02001cd Mon Sep 17 00:00:00 2001 From: uazo <29201891+uazo@users.noreply.github.com> Date: Wed, 16 Oct 2024 06:35:36 +0000 Subject: [PATCH] [AUTO] Patches auto-rebase --- .../Add-flag-to-disable-external-intent-requests.patch | 6 +++--- build/patches/Remove-binary-blob-integrations.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index 880562396..9fda0a81c 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -173,7 +173,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java -@@ -1521,6 +1521,12 @@ public class ExternalNavigationHandler { +@@ -1532,6 +1532,12 @@ public class ExternalNavigationHandler { || ignoreBackForwardNav(params); } @@ -186,7 +186,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal( ExternalNavigationParams params, Intent targetIntent, -@@ -1583,6 +1589,21 @@ public class ExternalNavigationHandler { +@@ -1594,6 +1600,21 @@ public class ExternalNavigationHandler { return OverrideUrlLoadingResult.forNoOverride(); } @@ -207,7 +207,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component + if (hasInternalScheme(params.getUrl(), targetIntent) || hasContentScheme(params.getUrl(), targetIntent) - || hasFileSchemeInIntentURI(params.getUrl(), targetIntent)) { + || hasFileSchemeInIntentURI(params.getUrl(), targetIntent) diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc new file mode 100644 --- /dev/null diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index 26a9c29d0..6fdf73384 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -1318,7 +1318,7 @@ diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java -@@ -2560,14 +2560,6 @@ public class ExternalNavigationHandler { +@@ -2572,14 +2572,6 @@ public class ExternalNavigationHandler { * @return Whether the given intent is going to open an Instant App. */ private static boolean isIntentToInstantApp(Intent intent) {