From 85b34148a47cfa8542622431a37163a5ae88fc7d Mon Sep 17 00:00:00 2001 From: uazo Date: Sat, 25 May 2024 11:23:48 +0000 Subject: [PATCH] [AUTO] Patches auto-rebase --- build/patches/Add-option-to-disable-snapshots.patch | 2 +- build/patches/Add-setting-to-clear-data-on-exit.patch | 2 +- build/patches/Add-setting-to-invert-tap-and-long-tap.patch | 4 ++-- build/patches/Cromite-Branding.patch | 2 +- build/patches/Enable-share-intent.patch | 2 +- build/patches/Move-navigation-bar-to-bottom.patch | 2 +- .../Remove-HTTP-referrals-in-cross-origin-navigation.patch | 2 +- build/patches/Welcome-screen.patch | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/patches/Add-option-to-disable-snapshots.patch b/build/patches/Add-option-to-disable-snapshots.patch index e17fecde..406c2998 100644 --- a/build/patches/Add-option-to-disable-snapshots.patch +++ b/build/patches/Add-option-to-disable-snapshots.patch @@ -208,7 +208,7 @@ diff --git a/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -5436,6 +5436,14 @@ To change this setting, BEGIN_LINKclear the Chrome da +@@ -5427,6 +5427,14 @@ To change this setting, BEGIN_LINKclear the Chrome da Your %1$swww.amazon.com timer ran out. It'll start again tomorrow. diff --git a/build/patches/Add-setting-to-clear-data-on-exit.patch b/build/patches/Add-setting-to-clear-data-on-exit.patch index e238d7ff..71f00711 100644 --- a/build/patches/Add-setting-to-clear-data-on-exit.patch +++ b/build/patches/Add-setting-to-clear-data-on-exit.patch @@ -513,7 +513,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1481,6 +1481,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1472,6 +1472,9 @@ Your Google account may have other forms of browsing history like searches and a Some of your web history might not show up here. If needed, tap Open full Chrome history. Also, Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. diff --git a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch index a5d307ba..2a3bc260 100644 --- a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch @@ -234,7 +234,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1692,6 +1692,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1683,6 +1683,12 @@ Your Google account may have other forms of browsing history like searches and a Disable toolbar swipe up @@ -247,7 +247,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -2871,6 +2877,9 @@ To change this setting, BEGIN_LINKclear the Chrome da +@@ -2862,6 +2868,9 @@ To change this setting, BEGIN_LINKclear the Chrome da Open in new Chrome tab diff --git a/build/patches/Cromite-Branding.patch b/build/patches/Cromite-Branding.patch index e5db8306..ac545107 100644 --- a/build/patches/Cromite-Branding.patch +++ b/build/patches/Cromite-Branding.patch @@ -13214,7 +13214,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -2178,7 +2178,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2169,7 +2169,7 @@ Your Google account may have other forms of browsing history like searches and a About Chrome diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index b47f91d2..0f1ca850 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -491,7 +491,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -5291,6 +5291,19 @@ To change this setting, BEGIN_LINKclear the Chrome da +@@ -5282,6 +5282,19 @@ To change this setting, BEGIN_LINKclear the Chrome da Make sure a phone app is enabled on this device diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index ca9e6098..fa7f8019 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -2486,7 +2486,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1659,6 +1659,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1650,6 +1650,12 @@ Your Google account may have other forms of browsing history like searches and a Force Tablet Mode diff --git a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch index 7ebeb7ac..e5eebdd3 100644 --- a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch +++ b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch @@ -480,7 +480,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/ch diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1054,6 +1054,30 @@ CHAR_LIMIT guidelines: +@@ -1045,6 +1045,30 @@ CHAR_LIMIT guidelines: For example, some websites may respond to this request by showing you ads that aren’t based on other websites you’ve visited. Many websites will still collect and use your browsing data — for example to improve security, to provide content, ads and recommendations, and to generate reporting statistics. diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index 31dc4dd2..8eca2b6a 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -1252,7 +1252,7 @@ diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/L diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -3290,7 +3290,29 @@ To change this setting, BEGIN_LINKclear the Chrome da +@@ -3281,7 +3281,29 @@ To change this setting, BEGIN_LINKclear the Chrome da %1$sGoogle Maps will open in Chrome. By continuing, you agree to the <LINK1>Google Terms of Service</LINK1>, and the <LINK2>Google Chrome and ChromeOS Additional Terms of Service</LINK2>. The <LINK3>Privacy Policy</LINK3> also applies.