Upgrade from Chromium 147.0.7727.102 to Chromium 147.0.7727.117 (#35799)
* Update from Chromium 147.0.7727.102 to Chromium 147.0.7727.117. * Update patches from Chromium 147.0.7727.102 to Chromium 147.0.7727.117. * Updated strings for Chromium 147.0.7727.117. * Disable failing upstream tests
This commit is contained in:
@@ -3029,14 +3029,17 @@ Brave is unable to recover your settings.
|
||||
Your settings were changed by an unknown app
|
||||
</message>
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_BODY" desc="Body text of the notification shown when Brave resets the default search engine, explaining that a change from outside Brave was detected.">
|
||||
Your default search engine was changed from outside of Brave. To protect you, Brave reset it.
|
||||
Your search engine was changed from outside of Brave. To protect you, Brave reset it to its original default. <ph name="LEARN_MORE_LINK">$1<ex>Learn more</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_GOT_IT_BUTTON" desc="Label for the 'Got it' button in the default search engine reset notification, which dismisses the UI.">
|
||||
Got it
|
||||
</message>
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_LEARN_MORE_BUTTON" desc="Label for the 'Learn more' button in the default search engine reset notification, which opens a help center article.">
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_LEARN_MORE_BUTTON" desc="Label for the 'Learn more' link in the default search engine reset notification, which opens a help center article.">
|
||||
Learn more
|
||||
</message>
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_SEARCH_SETTINGS_BUTTON" desc="Label for the 'Search settings' button in the default search engine reset notification, which opens the search engine settings page.">
|
||||
Search settings
|
||||
</message>
|
||||
|
||||
<!--Report-unsafe-site Dialog (accessed from Help menu)-->
|
||||
<message name="IDS_REPORT_UNSAFE_SITE_DIALOG_TITLE" desc="Title of the dialog for reporting an unsafe site to Brave">
|
||||
|
||||
@@ -3029,14 +3029,17 @@ Brave is unable to recover your settings.
|
||||
Your settings were changed by an unknown app
|
||||
</message>
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_BODY" desc="Body text of the notification shown when Brave resets the default search engine, explaining that a change from outside Brave was detected.">
|
||||
Your default search engine was changed from outside of Brave. To protect you, Brave reset it.
|
||||
Your search engine was changed from outside of Brave. To protect you, Brave reset it to its original default. <ph name="LEARN_MORE_LINK">$1<ex>Learn more</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_GOT_IT_BUTTON" desc="Label for the 'Got it' button in the default search engine reset notification, which dismisses the UI.">
|
||||
Got it
|
||||
</message>
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_LEARN_MORE_BUTTON" desc="Label for the 'Learn more' button in the default search engine reset notification, which opens a help center article.">
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_LEARN_MORE_BUTTON" desc="Label for the 'Learn more' link in the default search engine reset notification, which opens a help center article.">
|
||||
Learn more
|
||||
</message>
|
||||
<message name="IDS_DEFAULT_SEARCH_ENGINE_RESET_NOTIFICATION_SEARCH_SETTINGS_BUTTON" desc="Label for the 'Search settings' button in the default search engine reset notification, which opens the search engine settings page.">
|
||||
Search settings
|
||||
</message>
|
||||
|
||||
<!--Report-unsafe-site Dialog (accessed from Help menu)-->
|
||||
<message name="IDS_REPORT_UNSAFE_SITE_DIALOG_TITLE" desc="Title of the dialog for reporting an unsafe site to Brave">
|
||||
|
||||
@@ -550,9 +550,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
|
||||
Pinsets* pinsets,
|
||||
base::Time* timestamp) {
|
||||
constexpr std::string_view brave_certs = R"brave_certs(
|
||||
# Last updated: Wed Apr 15 14:54:16 2026
|
||||
# Last updated: Wed Apr 22 15:12:53 2026
|
||||
PinsListTimestamp
|
||||
1776279256
|
||||
1776885173
|
||||
|
||||
# =====BEGIN BRAVE ROOTS ASC=====
|
||||
#From https://www.amazontrust.com/repository/
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@
|
||||
"projects": {
|
||||
"chrome": {
|
||||
"dir": "src",
|
||||
"tag": "147.0.7727.102",
|
||||
"tag": "147.0.7727.117",
|
||||
"repository": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc
|
||||
index 2cdb7e2c503c019f932a5683aafd4902c26c5a17..8f205261f6e3488ca86f2792549498f92a03a749 100644
|
||||
index 06f8567338cad92e86ac46aa9ba14f515d028f8c..9351812b2548a3db556877294943bf28eb97a16a 100644
|
||||
--- a/chrome/browser/external_protocol/external_protocol_handler.cc
|
||||
+++ b/chrome/browser/external_protocol/external_protocol_handler.cc
|
||||
@@ -414,7 +414,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
|
||||
@@ -415,7 +415,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
|
||||
if (scheme == "mailto") {
|
||||
base::UmaHistogramEnumeration(kBlockStateMetric,
|
||||
BlockStateMetric::kAllowedDefaultMail);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
index 3a342cd782049c731d6734703ad291d9ab20a586..61dbfbdfcbb0bc8855c39fcb2090bda063220856 100644
|
||||
index f920fdfb0bcaca755c92ee459270b78011503952..67f8ed8ada65a6da8562edfdbb10c837dfd0c593 100644
|
||||
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
@@ -860,6 +860,7 @@ void LocationBarView::Layout(PassKey) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/content/browser/renderer_host/clipboard_host_impl.cc b/content/browser/renderer_host/clipboard_host_impl.cc
|
||||
index 2182b1ff71a09b14945646ba156b5d1cf234292c..5645d7d0a0e5976d516de3edd6baa0c62239491d 100644
|
||||
index fea07be048a85dc3c088338e23759b8ba43d2b1a..7c0c15d3314730a06871f6fb36f7ef838a4bf669 100644
|
||||
--- a/content/browser/renderer_host/clipboard_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/clipboard_host_impl.cc
|
||||
@@ -538,6 +538,7 @@ void ClipboardHostImpl::WriteText(const std::u16string& text) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||
index bab97c121551ab6e796dabaf66b3dc70d694cbca..4077343847bd218334846905b9996b636fa53d9c 100644
|
||||
index a2574a46ca0ebaed911afc1b51e38339404898df..5978e36ae3b2dec02ad2a85ab173292949ea4778 100644
|
||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -5347,6 +5347,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
||||
index 04b22c7f1ddbb747645ae71acc599704768e2ab6..cf2641276cf4201bf98dcf2f2614d08aad37c9b5 100644
|
||||
index e458843a00770588cf90b0c23118450df215fdf6..9d495514c4b80f530dd2f39d99cef0233642cba5 100644
|
||||
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
||||
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
||||
@@ -537,10 +537,10 @@ void DesktopNativeWidgetAura::UpdateWindowTransparency() {
|
||||
@@ -540,10 +540,10 @@ void DesktopNativeWidgetAura::UpdateWindowTransparency() {
|
||||
desktop_window_tree_host_->ShouldWindowContentsBeTransparent();
|
||||
|
||||
auto* window_tree_host = desktop_window_tree_host_->AsWindowTreeHost();
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
-MultistepFilterServiceFactoryTest.*
|
||||
-TabOrganizationServiceTest.*
|
||||
-TabStripActionContainerTest*.OrdersButtonsCorrectly*
|
||||
-TabStripActionContainerTest.GlicButton*
|
||||
-TabStripActionContainerTest.Glic*
|
||||
|
||||
# These tests fail because we don't use kChromeUINewTabPageThirdPartyURL
|
||||
-All/PermissionSubscriptionGeolocationTest.SubscribeUnsubscribeForNewTabPage/*
|
||||
|
||||
Reference in New Issue
Block a user