diff --git a/build/e_patches/Multiple-fingerprinting-mitigations.patch b/build/e_patches/Multiple-fingerprinting-mitigations.patch index eb6672273d2a5f940bdfc0974997b7e4ce49ee24..b7ba397dc0cc94aeba825a19977702dd17ebbba5 100644 --- a/build/e_patches/Multiple-fingerprinting-mitigations.patch +++ b/build/e_patches/Multiple-fingerprinting-mitigations.patch @@ -1,4 +1,4 @@ -From de95a1ee3de2406ef205e22958c0a84d5a7d13c2 Mon Sep 17 00:00:00 2001 +From 3a7fc69b11de0d8d390c7eadac64b59332874cc1 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 30 Mar 2018 10:09:03 +0200 Subject: Multiple fingerprinting mitigations @@ -445,7 +445,7 @@ index 15836249f962a..0f3cd2f665981 100644 String BaseRenderingContext2D::lang() const { diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index ad5d60eae0f2e..395ade1d8c34f 100644 +index f854f8a38c9f3..b3e6577dc6f6b 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn @@ -1756,7 +1756,9 @@ component("platform") { @@ -459,7 +459,7 @@ index ad5d60eae0f2e..395ade1d8c34f 100644 allow_circular_includes_from = [ "//third_party/blink/renderer/platform/blob", -@@ -1839,6 +1841,7 @@ component("platform") { +@@ -1840,6 +1842,7 @@ component("platform") { "//third_party/blink/public/strings", "//third_party/blink/renderer/platform/wtf", "//third_party/ced", diff --git a/build/e_patches/Update-i18n-zhCN-support.patch b/build/e_patches/Update-i18n-zhCN-support.patch index f9494fded6e4abee8e0a25804b3c532077b9e7e2..87948b974634921a92ed1deb535049ad4805c8b1 100644 --- a/build/e_patches/Update-i18n-zhCN-support.patch +++ b/build/e_patches/Update-i18n-zhCN-support.patch @@ -1,4 +1,4 @@ -From 4a4ed8196ad340f2a82cf067a9259ba0ffe575a0 Mon Sep 17 00:00:00 2001 +From 3b75a87c77adec9fc58489c081731697d17482d8 Mon Sep 17 00:00:00 2001 From: mars Date: Sun, 2 Aug 2020 00:37:49 +0800 Subject: Update i18n zh_CN support @@ -15,10 +15,10 @@ Signed-off-by: Saalim Quadri 6 files changed, 133 insertions(+), 6 deletions(-) diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb -index 11dd17e3cf5ec..42a6e9aceb03a 100644 +index d892d223b7e93..e3eec85ff1fac 100644 --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb -@@ -11942,4 +11942,6 @@ +@@ -11943,4 +11943,6 @@ 您需要开启 Chrome 同步才能使用 Wi-Fi 同步功能。了解详情 同步标签页分组 检查(&N) @@ -40,7 +40,7 @@ index f88c785b391bc..f675bcf885976 100644 +关于 Bromite + diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -index 108374ef1bfc7..7b74b5e1f983c 100644 +index c4f237691c7c4..d675585c143be 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb @@ -1842,4 +1842,74 @@ @@ -121,7 +121,7 @@ index 108374ef1bfc7..7b74b5e1f983c 100644 +全选 + diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb -index cdfdc651c531d..5bafaa36b3e0b 100644 +index f200cf8c010b5..c39bcf45ce6bf 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb @@ -720,4 +720,28 @@ @@ -156,7 +156,7 @@ index cdfdc651c531d..5bafaa36b3e0b 100644 +WebRTC + diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb -index cf5074dca3a98..fc1ef0ed0d436 100644 +index 81c24dd344eec..76817f7afd8ae 100644 --- a/components/strings/components_strings_zh-CN.xtb +++ b/components/strings/components_strings_zh-CN.xtb @@ -4993,4 +4993,33 @@ diff --git a/build/e_patches/add-trichrome-browser-apk-targets.patch b/build/e_patches/add-trichrome-browser-apk-targets.patch index a200eafc340a997066a97cca7830b05ef90826da..8c1d143643fbdfdf77f8029eebaf773f27004326 100644 --- a/build/e_patches/add-trichrome-browser-apk-targets.patch +++ b/build/e_patches/add-trichrome-browser-apk-targets.patch @@ -1,4 +1,4 @@ -From cab4e7b387f8d66f40972da34e9ff3611d469e07 Mon Sep 17 00:00:00 2001 +From 52fa05bc35b73297656272248f3a0760921a3372 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 27 May 2021 07:30:02 -0400 Subject: add trichrome browser apk targets @@ -63,7 +63,7 @@ index 7cc55beab0928..447e9982802bf 100644 # As compared to chrome_public_test_apk, this target contains only unit tests # that require on device capabilities. These tests are smaller, more tightly diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 432f8b64f6e3a..fe6280754f722 100644 +index 909756bb4b565..fbf251248b0de 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -497,6 +497,8 @@ template("chrome_common_apk_or_module_tmpl") { diff --git a/domain_substitution/domain_substitution.list b/domain_substitution/domain_substitution.list index 5f031848c370109c6a3063cfac803304ff443d0c..d9f56b8fc908290c7e71c3a5b737d895cd8298f9 100644 --- a/domain_substitution/domain_substitution.list +++ b/domain_substitution/domain_substitution.list @@ -1158,6 +1158,7 @@ chrome/browser/flags/android/chrome_session_state.h chrome/browser/font_prewarmer_tab_helper_browsertest.cc chrome/browser/glic/e2e_test/glic_e2e_test.cc chrome/browser/glic/fre/glic_fre_controller.cc +chrome/browser/glic/fre/glic_fre_controller_interactive_uitest.cc chrome/browser/glic/fre/glic_fre_controller_unittest.cc chrome/browser/glic/fre/glic_fre_page_handler.cc chrome/browser/glic/glic_metrics_unittest.cc @@ -1167,6 +1168,7 @@ chrome/browser/glic/host/glic_cookie_synchronizer.cc chrome/browser/glic/host/glic_cookie_synchronizer_unittest.cc chrome/browser/glic/host/glic_page_handler.cc chrome/browser/glic/host/glic_ui.cc +chrome/browser/glic/host/glic_ui_interactive_uitest.cc chrome/browser/glic/host/guest_util_unittest.cc chrome/browser/glic/media/glic_media_integration.cc chrome/browser/glic/media/glic_media_integration_unittest.cc @@ -1564,6 +1566,7 @@ chrome/browser/resources/gaia_auth_host/PRESUBMIT.py chrome/browser/resources/gaia_auth_host/authenticator.js chrome/browser/resources/gaia_auth_host/saml_handler.js chrome/browser/resources/gaia_auth_host/saml_password_attributes.js +chrome/browser/resources/glic/fre/fre_app_controller.ts chrome/browser/resources/glic/url_pattern.d.ts chrome/browser/resources/glic/webview.ts chrome/browser/resources/hangout_services/manifest_v2.json diff --git a/versions.txt b/versions.txt index 8a462419d18f6bb60545751e4b8024d284810aaf..d0324be45fc2ef139a05d61d848c8792714dfb95 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,3 @@ -chromium_version="141.0.7390.43" +chromium_version="141.0.7390.70" cromite_branch="v141.0.7390.55-b2824377c30847f42e00c6ace66d91fa516b5f51" -ungoogled_chromium_branch="141.0.7390.54-1" +ungoogled_chromium_branch="141.0.7390.65-1"