Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from Chromium 119.0.6045.66 to Chromium 119.0.6045.105 #20783

Merged
merged 3 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Tue Oct 31 14:07:28 UTC 2023
# Last updated: Tue Oct 31 22:08:56 UTC 2023
PinsListTimestamp
1698761248
1698790136

# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "119.0.6045.66",
"tag": "119.0.6045.105",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index cbb37120046ba485b70adacc1900fdfd5e16e4de..3bf4aad858686d908c1ec0e0b54bd4dbb53a7ce1 100644
index 537f70ba2460ef04e9bbc1991de05cdbae2d59b7..10add218883d05282e5b83233684b5b3f27f0471 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=119
-MINOR=0
-BUILD=6045
-PATCH=66
-PATCH=105
+MINOR=1
+BUILD=62
+PATCH=16
2 changes: 1 addition & 1 deletion patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 419e96b4fdc136c24b9fb7a5f16f875e0426e08b..fcabf30a0d61c71ff365b4916eb10ca526932d16 100644
index 31aca0900ef68ba3cd51943f0890c9f6d8e6194f..6f78032119f3a8de445fa899ca3a9216b321521e 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4071,6 +4071,7 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 74afb837d45f75066dc7c10d3f7bc15e7ac93b53..afadc19ebe57916a17b0f8581fa07641f90d868a 100644
index b4a12d129fa5263ab30ace75e33adc022d46f353..ab2fe928af1c24c402b2a43862dde3f254b55eda 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -2173,6 +2173,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
@@ -2164,6 +2164,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
selection_navigation_url_ = match.destination_url;
if (!selection_navigation_url_.is_valid())
return;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h
index 45f2a2a82cb03ef3b4a1a3c535c21999bdc4bc8c..7e13510d6e1591e90d8bbd9d013ea9ef6783304d 100644
index 2d38d86a07d987ea1816d6533d4ce1bca57624e7..efe44679696dcb52a55705a46b7753dc7670cae3 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -191,6 +191,7 @@ class RenderViewContextMenu
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index a9f542230542bc65e2108d0e346c9cc8a6c6c199..fe197f36fa328336ff0f174dc4af6320169759b6 100644
index 430a2b2dca1c55e50145a7b896a15f0487cffa48..f002787ec55a4ea780023e49250ca6a896ccc58c 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -1159,6 +1159,7 @@ void BookmarkBarView::Layout() {
@@ -1164,6 +1164,7 @@ void BookmarkBarView::Layout() {
x = next_x;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
index c9f503e8ece414820e7f7604a12251ac938cfab7..b52444e6755416447d84fd852ed5712a40022191 100644
index 4b6ec1a92a3f04bb0d534e7594fc23cb48618eaf..3bfe778fc70d02021151852a7e94837ec67241ce 100644
--- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
+++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
@@ -51,7 +51,7 @@ class View;
@@ -45,7 +45,7 @@ class View;
// registry's active_entry() then global registry's. These values are reset when
// the side panel is closed and |last_active_global_entry_id_| is used to
// determine what entry is seen when the panel is reopened.
Expand Down
6 changes: 3 additions & 3 deletions patches/chrome-browser-ui-views-tabs-tab.cc.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 46f9031f7592249a380a16857a1be000f39d693f..058996be785c904082d7c0db6f49dc8c07ee8b02 100644
index 14704ed4ed53e034f4d43bd30330c486fc64bc67..7d81149a1f20efcc6c5a348fdc714d87ff7a87c8 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -418,6 +418,7 @@ void Tab::Layout() {
@@ -419,6 +419,7 @@ void Tab::Layout() {
int title_right = contents_rect.right();
if (showing_alert_indicator_) {
title_right = alert_indicator_button_->x() - after_title_padding;
+ BRAVE_UI_VIEWS_TABS_TAB_ALERT_INDICATOR_POSITION
} else if (showing_close_button_) {
// Allow the title to overlay the close button's empty border padding.
title_right = close_x - after_title_padding;
@@ -1058,6 +1059,7 @@ void Tab::UpdateIconVisibility() {
@@ -1059,6 +1060,7 @@ void Tab::UpdateIconVisibility() {
available_width -= favicon_width;

showing_close_button_ = large_enough_for_close_button;
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-test-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 29d8db1e97c15eabedb997afe2a6c99da55af69f..c1c2f20fe6a1eb87180cb463c9c608c42b6fe407 100644
index a39d63a6bbf905ff8266bbbefddc6f5a8bebb332..1004e938355fea3a93c8ece5ff84c5cf7ed997be 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -447,6 +447,7 @@ static_library("test_support") {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/extensions/browser/api/web_request/extension_web_request_event_router.cc b/extensions/browser/api/web_request/extension_web_request_event_router.cc
index 49b904570d579e01ca26e95b83f117124b66d6b6..9ba3bb69801010fbabdd2a89452a546fbb409096 100644
index 794dfb974bf06d4f27fa3c9c55f0a42acbd1100f..4d9fc81877ccdf599d46239ffccb4b6b1ec17602 100644
--- a/extensions/browser/api/web_request/extension_web_request_event_router.cc
+++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc
@@ -1183,6 +1183,7 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
Expand Down