diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 1accc1b7..4ae10336 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -1354,7 +1354,7 @@ diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer +void ProfileWriter::AddBookmarksWithModel( + BookmarkModel* model, + const std::vector& bookmarks, -+ const base::string16& top_level_folder_name) { ++ const std::u16string& top_level_folder_name) { + if (bookmarks.empty()) + return; + @@ -1379,7 +1379,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/ + virtual void AddBookmarksWithModel( + bookmarks::BookmarkModel* model, + const std::vector& bookmarks, -+ const base::string16& top_level_folder_name); ++ const base::u16string& top_level_folder_name); + virtual void AddFavicons(const favicon_base::FaviconUsageDataList& favicons); diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index e915f51c..c091b41b 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -7718,7 +7718,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro CHAR-LIMIT guidelines: Certain strings need character limits to prevent a long translation from breaking the UI. -@@ -892,7 +892,7 @@ Privacy Sandbox is still in active development and is available in selected regi +@@ -857,7 +857,7 @@ Privacy Sandbox is still in active development and is available in selected regi Choose another provider @@ -7727,7 +7727,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro This setting is disabled on managed browsers -@@ -922,7 +922,7 @@ Privacy Sandbox is still in active development and is available in selected regi +@@ -887,7 +887,7 @@ Privacy Sandbox is still in active development and is available in selected regi The selected data has been removed from Chrome and your synced devices. @@ -7736,7 +7736,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Cached images and files -@@ -959,10 +959,10 @@ Your Google account may have other forms of browsing history like searches and a +@@ -924,10 +924,10 @@ Your Google account may have other forms of browsing history like searches and a Record history even in incognito mode @@ -7749,7 +7749,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro To clear <link1>search</link1> or other forms of history, visit <link2>My Google Activity</link2> -@@ -1025,7 +1025,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -990,7 +990,7 @@ Your Google account may have other forms of browsing history like searches and a Basic @@ -7758,7 +7758,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Blocked site -@@ -1435,7 +1435,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1400,7 +1400,7 @@ Your Google account may have other forms of browsing history like searches and a In Lite mode, Chrome loads pages faster and uses up to 60 percent less data. To optimize the pages that you visit, Chrome sends your web traffic to Google. <link>Learn more</link> @@ -7767,7 +7767,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Turn on Lite mode -@@ -1622,10 +1622,10 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1587,10 +1587,10 @@ Your Google account may have other forms of browsing history like searches and a Waiting for details of parents. @@ -7780,7 +7780,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Content -@@ -1684,22 +1684,22 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1649,22 +1649,22 @@ Your Google account may have other forms of browsing history like searches and a Google Terms of Service @@ -7807,7 +7807,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -1716,7 +1716,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1681,7 +1681,7 @@ Your Google account may have other forms of browsing history like searches and a Also clear your Chrome data from this device @@ -7816,7 +7816,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Contacting Google. This may take a minute… -@@ -1861,7 +1861,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -7825,7 +7825,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro <link>Get help</link> while scanning for devices… -@@ -1906,7 +1906,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -7834,7 +7834,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Unknown or unsupported device (%1$sA1:B2:C3:D4:E5:F6) -@@ -3751,7 +3751,7 @@ Data from your Incognito session will only be cleared from Chrome when you @@ -7843,7 +7843,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro No compatible devices found -@@ -3790,7 +3790,7 @@ Data from your Incognito session will only be cleared from Chrome when you @@ -7852,7 +7852,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Got it -@@ -4054,7 +4054,7 @@ Data from your Incognito session will only be cleared from Chrome when you %1$sTanya's Pixel 2... @@ -23905,7 +23905,7 @@ diff --git a/content/browser/speech/tts_mac.mm b/content/browser/speech/tts_mac. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -6485,7 +6485,7 @@ void WebContentsImpl::RunJavaScriptDialog( +@@ -6479,7 +6479,7 @@ void WebContentsImpl::RunJavaScriptDialog( base::StringPrintf( "A different origin subframe tried to create a JavaScript " "dialog. This is no longer allowed and was blocked. See "