Skip to content

Commit 2ffe602

Browse files
quh4gko8thestinger
authored andcommitted
Update/port patches for 125.0.6422.72.1
1 parent 7493be8 commit 2ffe602

5 files changed

+14
-14
lines changed

patches/0106-Support-opening-external-web-search-in-incognito.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ index 1dcd333c8c552..2ca117c8a08f6 100644
2525
intent.putExtra(SearchWidgetProvider.EXTRA_FROM_SEARCH_WIDGET, true);
2626
}
2727
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
28-
index 9576d3131006e..3c20453a7022a 100644
28+
index 9576d3131006e..e7ab84a7b4d7c 100644
2929
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
3030
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
3131
@@ -1,5 +1,9 @@
@@ -46,7 +46,7 @@ index 9576d3131006e..3c20453a7022a 100644
4646
+ static Intent modifyIntentForStartActivity(Activity activity, Intent intent) {
4747
+ Intent newIntent = intent;
4848
+ if (TabPreferencesUtils.shouldOpenLinksInIncognito()) {
49-
+ intent = TabPreferencesUtils.appendNeededIncognitoExtras(activity, intent);
49+
+ newIntent = TabPreferencesUtils.appendNeededIncognitoExtras(activity, intent);
5050
+ }
5151
+
5252
+ return newIntent;

patches/0107-Extend-opening-links-from-external-apps-in-incognito.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ Subject: [PATCH] Extend opening links from external apps in incognito for
1010
2 files changed, 18 insertions(+)
1111

1212
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
13-
index fe9bbd148b60c..ea5f494157b50 100644
13+
index fe9bbd148b60c..97fb584f0ec86 100644
1414
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
1515
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
1616
@@ -261,6 +261,7 @@ public class LaunchIntentDispatcher {
1717
newIntent.setAction(Intent.ACTION_VIEW);
1818
newIntent.setData(uri);
1919
newIntent.setClassName(context, CustomTabActivity.class.getName());
20-
+ newIntent = LaunchIntentDispatcherHooks.maybeModifyCustomTabIntents(context, intent);
20+
+ newIntent = LaunchIntentDispatcherHooks.maybeModifyCustomTabIntents(context, newIntent);
2121

2222
// Since configureIntentForResizableCustomTab() might change the componenet/class
2323
// associated with the passed intent, it needs to be called after #setClassName(context,
2424
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
25-
index aaec00177de6e..a3a5d21f71d9f 100644
25+
index aaec00177de6e..6394a993ecd80 100644
2626
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
2727
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
2828
@@ -1,9 +1,20 @@
@@ -37,7 +37,7 @@ index aaec00177de6e..a3a5d21f71d9f 100644
3737
+ private static Intent maybeCreateIncognitoTabIntentFor(Context context, Intent intent) {
3838
+ Intent newIntent = intent;
3939
+ if (TabPreferencesUtils.shouldOpenLinksInIncognito()) {
40-
+ newIntent = TabPreferencesUtils.createIncognitoIntent(context, intent);
40+
+ newIntent = TabPreferencesUtils.appendNeededIncognitoExtras(context, intent);
4141
+ }
4242
+
4343
+ return newIntent;

patches/0108-Extend-opening-links-from-external-apps-in-incognito.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Subject: [PATCH] Extend opening links from external apps in incognito for
1212
4 files changed, 20 insertions(+), 1 deletion(-)
1313

1414
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
15-
index ea5f494157b50..3b16e0450ef9a 100644
15+
index 97fb584f0ec86..5f059ef6ff070 100644
1616
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
1717
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
1818
@@ -221,6 +221,8 @@ public class LaunchIntentDispatcher {
@@ -25,7 +25,7 @@ index ea5f494157b50..3b16e0450ef9a 100644
2525
}
2626
return true;
2727
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
28-
index a3a5d21f71d9f..710fa25ee2826 100644
28+
index 6394a993ecd80..c621109d7fdbe 100644
2929
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
3030
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
3131
@@ -29,4 +29,10 @@ final class LaunchIntentDispatcherHooks {
@@ -63,7 +63,7 @@ index 2ca117c8a08f6..0540dc9341529 100644
6363
return profileProvider;
6464
}
6565
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
66-
index 3c20453a7022a..8ad2b300587d3 100644
66+
index e7ab84a7b4d7c..10cde3e0fb01b 100644
6767
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
6868
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
6969
@@ -3,6 +3,8 @@ package org.chromium.chrome.browser.searchwidget;

patches/0109-Extend-opening-links-from-external-apps-in-incognito.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Subject: [PATCH] Extend opening links from external apps in incognito for
1010
2 files changed, 7 insertions(+)
1111

1212
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
13-
index 3b16e0450ef9a..8e6bf5ae19cf8 100644
13+
index 5f059ef6ff070..edb1c9b177b57 100644
1414
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
1515
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
1616
@@ -149,6 +149,7 @@ public class LaunchIntentDispatcher {
@@ -22,7 +22,7 @@ index 3b16e0450ef9a..8e6bf5ae19cf8 100644
2222
url = IntentHandler.getUrlFromIntent(mIntent);
2323
}
2424
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
25-
index 710fa25ee2826..390eb03db1101 100644
25+
index c621109d7fdbe..2aa023c3f15c1 100644
2626
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
2727
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
2828
@@ -35,4 +35,10 @@ final class LaunchIntentDispatcherHooks {

patches/0110-Do-not-select-search-query-text-when-opening-web-and.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Subject: [PATCH] Do not select search query text when opening web and global
1313
5 files changed, 43 insertions(+), 4 deletions(-)
1414

1515
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
16-
index 8e6bf5ae19cf8..6b876d889a48b 100644
16+
index edb1c9b177b57..e54b3eb20ff61 100644
1717
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
1818
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
1919
@@ -223,7 +223,7 @@ public class LaunchIntentDispatcher {
@@ -26,7 +26,7 @@ index 8e6bf5ae19cf8..6b876d889a48b 100644
2626
}
2727
return true;
2828
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
29-
index 390eb03db1101..b14f5d0d4a3c2 100644
29+
index 2aa023c3f15c1..1fdc7b7c0d4dc 100644
3030
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
3131
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcherHooks.java
3232
@@ -1,9 +1,12 @@
@@ -74,7 +74,7 @@ index 0540dc9341529..7aded2b0dcc13 100644
7474

7575
@Override
7676
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
77-
index 8ad2b300587d3..cde1108568d28 100644
77+
index 10cde3e0fb01b..728d447a28812 100644
7878
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
7979
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityHooks.java
8080
@@ -27,4 +27,18 @@ public class SearchActivityHooks {

0 commit comments

Comments
 (0)