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.

Sign up for GitHub

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 90.0.4430.51 to Chromium 90.0.4430.61 (1.24.x). #8486

Merged
merged 1 commit into from
Apr 9, 2021
Merged

Upgrade from Chromium 90.0.4430.51 to Chromium 90.0.4430.61 (1.24.x). #8486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions app/bookmarks_strings.grdp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
<message name="IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT" desc="Name shown in the context menu to hide/show the apps shortcut in the bookmark bar">
Show apps shortcut
</message>
<message name="IDS_BOOKMARK_BAR_SHOW_READING_LIST" desc="Name shown in the context menu to hide/show the reading list in the bookmark bar">
Show reading list
</message>
<message name="IDS_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS_DEFAULT_NAME" desc="Name shown in the context menu to hide/show the managed bookmarks in the bookmark bar">
Show managed bookmarks
</message>
Expand All @@ -39,6 +42,9 @@
<message name="IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT" desc="In Title Case: Name shown in the context menu to hide/show the apps shortcut in the bookmark bar">
Show Apps Shortcut
</message>
<message name="IDS_BOOKMARK_BAR_SHOW_READING_LIST" desc="In Title Case: Name shown in the context menu to hide/show the reading list in the bookmark bar">
Show Reading List
</message>
<message name="IDS_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS_DEFAULT_NAME" desc="In Title Case: Name shown in the context menu to hide/show the managed bookmarks in the bookmark bar">
Show Managed Bookmarks
</message>
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 02de76cc1174d0413c55f9630836353958dcba16..67e01bedd40b964e2c377959d78453e8cbe1bb1a 100644
index 3716a10718b2aaed7c97e4c9579bab273707bac2..9426cceae5b5344a9aa5f1533e1c023fc2298e29 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=90
-MINOR=0
-BUILD=4430
-PATCH=51
-PATCH=61
+MINOR=1
+BUILD=24
+PATCH=56
6 changes: 3 additions & 3 deletions patches/chrome-android-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index a9652ed1c3f4f4fe8c47a55320b0a34fa62017a0..d40afa33b298b775e432f4167a979c579db2686c 100644
index 38c40cd243dcdd7440f8884f2081e0b01bb56da0..21fd63d3c264f37799b8136955e788c7e30f589d 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -236,6 +236,7 @@ android_resources("chrome_app_java_resources") {
Expand All @@ -26,15 +26,15 @@ index a9652ed1c3f4f4fe8c47a55320b0a34fa62017a0..d40afa33b298b775e432f4167a979c57

# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -712,6 +715,7 @@ group("jni_headers") {
@@ -713,6 +716,7 @@ group("jni_headers") {
"//chrome/browser/webauthn/android:jni_headers",
"//components/media_router/browser/android:jni_headers",
]
+ public_deps += ["//brave/build/android:jni_headers"]
}

# TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
@@ -1900,6 +1904,7 @@ if (current_toolchain == default_toolchain) {
@@ -1902,6 +1906,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index b20b829650c3bc744ac0494fd98585ecc03c2cbf..5763f4ad4a3f2901542f5a153c84a187d91c6694 100644
index 60acfefd43e4a8a74ae45f86fcef13b56b286e8e..d825fd35ddb17aca21740066a87907c2673dfa99 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2501,6 +2501,7 @@ static_library("browser") {
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index 8749fa5adf499509cb65716a234e830a6c3d4ed8..96c54193767437107f50fc556e85f3417dded7e9 100644
index 0f8f7f4c975d398298a94c90c2a364a37f3d7fa7..94610fef241ad1dad4f66a2f2ee9d77ca1d0444b 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -314,6 +314,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
@@ -316,6 +316,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
};

const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
View file
Open in desktop
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 8de3a60632b24c2c8006f5c9fc4b9c67c0c3c704..7a45dddcc3127f9a8f9a9447ae8a6f92655ecca5 100644
index 371bcf5d3c4b7225c2fccffed59a5d1747289e62..83141e0e413864d05f21970a5dcc78cae392a85c 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -856,6 +856,7 @@ void BookmarkBarView::Layout() {
@@ -862,6 +862,7 @@ void BookmarkBarView::Layout() {
x = next_x;
}
}
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-test-BUILD.gn.patch
View file
Open in desktop
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 9e1add5823aaff07eb7716af7ee09b3c7f42ccf1..9179201cfa7db22b75a7db27a680244446944c56 100644
index 8428b7508092816a57510cf5f9d74d3925038cfa..b90ac9b30fb37ab641a3b71d5fb098f38469b66a 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -899,6 +899,7 @@ if (!is_android) {
Expand Down
4 changes: 2 additions & 2 deletions patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
index 7fa820de01fd548c8a4226809737febec14be9d0..e8d2b7feeba4a6c0aeabac95cca5f55ae1189904 100644
index 212c4b819d5a2baafe672343942c003c88fc29a9..9bfea3cf51bc4bf64f3755a7b20e7a2cf439f498 100644
--- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
@@ -14093,6 +14093,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
@@ -14095,6 +14095,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>
Expand Down