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 patches from Chromium 91.0.4472.38 to Chromium 91.0.4472.57 #8793

Merged
merged 3 commits into from
May 14, 2021
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
21 changes: 3 additions & 18 deletions app/printing_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@
<message name="IDS_PRINT_PREVIEW_PRINT_TO_PDF" desc="Option shown on printer drop-down list for saving previewed document as a PDF.">
Save as PDF
</message>
<message name="IDS_PRINT_PREVIEW_PRINT_TO_GOOGLE_DRIVE" desc="Option shown on printer drop-down list for saving previewed document to Google Drive.">
Save to Google Drive
</message>
<message name="IDS_PRINT_PREVIEW_SHEET_SUMMARY_LABEL" desc="Print summary, explaining to the user how many pages will be printed.">
{COUNT, plural,
=1 {1 sheet of paper}
Expand Down Expand Up @@ -271,21 +268,6 @@
<message name="IDS_PRINT_PREVIEW_NEW_SHOW_ADVANCED_OPTIONS" desc="The text for the button to open the printer's advanced settings dialog in the new UI.">
Advanced settings
</message>
<message name="IDS_PRINT_PREVIEW_ACCEPT_INVITE" desc="Text for the button to accept the printer-sharing invitation.">
Accept
</message>
<message name="IDS_PRINT_PREVIEW_ACCEPT_GROUP_INVITE" desc="Text for the button to accept the printer-sharing invitation for the group of users.">
Accept for group
</message>
<message name="IDS_PRINT_PREVIEW_REJECT_INVITE" desc="Text for the button to reject the printer-sharing invitation.">
Reject
</message>
<message name="IDS_PRINT_PREVIEW_GROUP_INVITE_TEXT" desc="Message to show when the user has pending printer-sharing invitation for the group of users they are a manager of.">
&lt;strong&gt;<ph name="SENDER">$1</ph>&lt;/strong&gt; wants to share a printer &lt;strong&gt;<ph name="PRINTER_NAME">$2</ph>&lt;/strong&gt; with a group you own: &lt;strong&gt;<ph name="GROUP_NAME">$3</ph>&lt;/strong&gt;. If you accept, all group members will be able to print to the printer.
</message>
<message name="IDS_PRINT_PREVIEW_INVITE_TEXT" desc="Message to show when the user has pending printer-sharing invitation.">
&lt;strong&gt;<ph name="SENDER">$1</ph>&lt;/strong&gt; wants to share a printer &lt;strong&gt;<ph name="PRINTER_NAME">$2</ph>&lt;/strong&gt; with you.
</message>
<message name="IDS_PRINT_PREVIEW_BUTTON_SELECT" desc="Label for a button in a dialog asking a user to confirm selection of a printer in print preview UI. The printer gets selected if the user clicks the button.">
Select
</message>
Expand All @@ -305,6 +287,9 @@
These settings are enforced by your administrator
</message>
<if expr="chromeos">
<message name="IDS_PRINT_PREVIEW_PRINT_TO_GOOGLE_DRIVE" desc="Option shown on printer drop-down list for saving previewed document to Google Drive.">
Save to Google Drive
</message>
<message name="IDS_PRINT_PREVIEW_SERVER_SEARCH_BOX_PLACEHOLDER" desc="Text to put in a print server search box when user has not entered a search query.">
Print servers
</message>
Expand Down
20 changes: 13 additions & 7 deletions app/settings_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -577,18 +577,18 @@
Password deleted from this device and your Brave sync chain
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_PASSWORDS_TO_ACCOUNT" desc="Message displayed in the moving multiple passwords to the user Brave sync chain banner.">
To use them on all your devices, move them to your Brave sync chain
To easily use them on all your devices, you can move them to your Brave sync chain
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_PASSWORDS_TO_ACCOUNT_COUNT" desc="Label shown in the link that open moving multiple password dialog.">
{COUNT, plural,
=1 {{COUNT} password is accessible on this device}
other {{COUNT} passwords are accessible on this device}}
=1 {{COUNT} password is stored on this device}
other {{COUNT} passwords are stored on this device}}
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_PASSWORDS_TO_ACCOUNT_DIALOG_FOOTER" desc="Footer for the dialog that asks the user to select which passwords to move to their Brave sync chain.">
Passwords will be moved from your device to your Brave sync chain
<message name="IDS_SETTINGS_PASSWORD_MOVE_PASSWORDS_TO_ACCOUNT_DIALOG_BODY_TEXT" desc="Text displayed in the dialog that asks the user to select which passwords to move to their Brave sync chain.">
Choose which passwords to move. You can access them whenever you're signed in.
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_PASSWORDS_TO_ACCOUNT_DIALOG_TITLE" desc="Title for the dialog that asks the user to select which passwords to move to their Brave sync chain.">
Choose which passwords to move
Move passwords from this device to your Brave sync chain?
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_PASSWORDS_TO_ACCOUNT_SNACKBAR" desc="Text in the snackbar that appears after the user successfuly moved local passwords to their Brave sync chain.">
Passwords moved to your Brave sync chain
Expand All @@ -599,14 +599,20 @@
<message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_BODY" desc="Description message for the dialog that confirms whether the user wishes to move a password to their Brave sync chain.">
Move your password to your Brave sync chain to access it securely wherever you're signed in
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_MULTIPLE_PASSWORDS_TO_ACCOUNT_DIALOG_MOVE_BUTTON_TEXT" desc="Text for the button that confirms moving multiple passwords to the user Brave sync chain.">
Move passwords
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_MULTIPLE_PASSWORDS_TO_ACCOUNT_DIALOG_CANCEL_BUTTON_TEXT" desc="Text for the button that cancels the action of moving multiple passwords to the user Brave sync chain.">
Don't move
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_MOVE_BUTTON_TEXT" desc="Text for the button that confirms moving a password to the user Brave sync chain.">
Move
</message>
<message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_CANCEL_BUTTON_TEXT" desc="Text for the button that cancels the action of moving a password to the user Brave sync chain.">
Cancel
</message>
<message name="IDS_SETTINGS_PASSWORD_OPEN_MOVE_MULTIPLE_PASSWORDS_TO_ACCOUNT_DIALOG_BUTTON_TEXT" desc="Text for the button that opens the dialog that moves multiple passwords to the user Brave sync chain.">
Move passwords
Get started
</message>
<message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_TITLE" desc="Title for the dialog that asks the user which versions of a password to remove (device, Brave sync chain or both).">
Delete password?
Expand Down
1 change: 1 addition & 0 deletions browser/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ source_set("ui") {
"//brave/browser/resources/settings:resources",
"//brave/browser/ui/bookmark",
"//brave/components/brave_new_tab_ui:generated_resources",
"//brave/components/brave_perf_predictor/browser:buildflags",
"//brave/components/brave_sync",
"//brave/components/brave_sync:profile_sync_service_helper",
"//brave/components/brave_welcome_ui:generated_resources",
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 9b3f6baacbcf3f6d2d1c0f81f83519566edca30e..72888782328d9b51776d0ee69f4719447ef3d74f 100644
index 291d183829af54da51ffb000e2024e36a9928d24..3975fe26200a91b7a5602821475e884caf7ef8ef 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=91
-MINOR=0
-BUILD=4472
-PATCH=38
-PATCH=57
+MINOR=1
+BUILD=26
+PATCH=18
4 changes: 2 additions & 2 deletions patches/chrome-android-features-tab_ui-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
index dd226de107fc488d25ea342019baaaf809978ca3..5778a75368de560e511c0f056ba5d182feddffa5 100644
index 5947cb28ae1aac0f062c5cb21667bfd31603b449..4f12dd4e6f8318374fe2d47efe727a52b0a14232 100644
--- a/chrome/android/features/tab_ui/BUILD.gn
+++ b/chrome/android/features/tab_ui/BUILD.gn
@@ -191,6 +191,7 @@ android_library("java") {
@@ -194,6 +194,7 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java",
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
index 7e966940f3005bf9ccd9f8c6910f4ebc56c36075..4996d997cfa83a62793bfce64d5ffa860edb9049 100644
index 2b6d6ef3e4d775bbca6204c05f6d67e33baddd3e..2ca31b2b5cee32caf4d88407e2aae71d889a34d7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
@@ -245,6 +245,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-BUILD.gn.patch
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 7311821a8c1e5e187eae1520931ed1d08cd02e62..072b155175dc83569c49044ba8005afa87c6da37 100644
index 9fedd83307439aa6a6780de63e6be73ccea101af..fe9ccfc1803bd718d0eeb74a274b01842b3b5723 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2455,6 +2455,7 @@ static_library("browser") {
Expand Down
4 changes: 2 additions & 2 deletions 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 41b381acc941d469ec329e0d8bef834167b19e23..1acca5535dbea5132a7f1a37c0506d130a1205e9 100644
index e21d38b138415121f233ff98ab99c402b0732c50..cb33c906cea2b08ab85c99a9eb90a13257713573 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -309,14 +309,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
Expand All @@ -21,7 +21,7 @@ index 41b381acc941d469ec329e0d8bef834167b19e23..1acca5535dbea5132a7f1a37c0506d13

const FeatureEntry::Choice kPassiveListenersChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
@@ -7273,6 +7273,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7282,6 +7282,7 @@ const FeatureEntry kFeatureEntries[] = {
// "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
// Histograms" in tools/metrics/histograms/README.md (run the
// AboutFlagsHistogramTest unit test to verify this process).
Expand Down
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 067740efe3eb88b7bf0dd0537b2700a65a47a7d1..2cedfd30a25bc3323fdd0dbca3271f59d297c952 100644
index 27085587c735c03aac79d1001d0a4a27e4b5729f..b6cf4210918961488d4230a4d2e7b72809bf60bc 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -316,6 +316,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
@@ -317,6 +317,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
};

const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-ui-tabs-tab_strip_model.h.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
index 5708cfdda03b95a109ca1fcaf2458ae45af2aa86..ea0f0ad734a659d8091515e0fa061bbcb21aac8d 100644
index dbf42684a867447f85de331d6f34390c0be45cce..6d5b66a5215cf75708cdfa8f0298b19572692485 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.h
+++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -588,6 +588,7 @@ class TabStripModel : public TabGroupController {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index 8cf84b8828579dedda21a848af7cd4701dab13ac..117b00e387576726f8a28092af79493d55377e07 100644
index 5483a4d9f89287c073daf89b7ccc4df7ec7cb904..3fbf593c22c02399f4a3908d405809294d76eb0f 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -2627,6 +2627,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -2631,6 +2631,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);

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 296477503059b1ca9f89ea6968c58ffc95315c06..9e75e97e186450f8558de4868cb02310cb971cf0 100644
index b1e1b9c071491ea256c5334512a520da0d83a2d1..1597d2cc3584743613d0dad64abf54712c7f0fff 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -904,6 +904,7 @@ if (!is_android) {
Expand Down
4 changes: 2 additions & 2 deletions patches/content-browser-browser_main_loop.h.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index e116a3de7fb765758793b3feecab2654193c3a96..dae4ab0fd028ed62894d1ad1815cca6e2cc803cd 100644
index 69b091698f04209af113af6c586ec8615ff52d41..351c1b4d96d81d80ae2118f9991a261e924ba8b2 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -159,6 +159,7 @@ class CONTENT_EXPORT BrowserMainLoop {
@@ -160,6 +160,7 @@ class CONTENT_EXPORT BrowserMainLoop {
void RunMainMessageLoop();

// Performs the pre-shutdown steps.
Expand Down
2 changes: 1 addition & 1 deletion patches/sandbox-policy-win-sandbox_win.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
index 2c8c099ea62ed9da1532496a796774493b0f49bf..49a79c866658973734b22e591be1512f6ce558de 100644
index 21f6c792c1af9625bbbc3afa06fb926939c7776c..9e1c1f26b44305cbec5de65c3c4176effee0bd18 100644
--- a/sandbox/policy/win/sandbox_win.cc
+++ b/sandbox/policy/win/sandbox_win.cc
@@ -773,6 +773,7 @@ ResultCode LaunchWithoutSandbox(
Expand Down
4 changes: 2 additions & 2 deletions patches/services-network-public-cpp-cors-cors.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc
index f148465db9eb3dd92d3851090c45f815cff7199f..ea59257be7f747d834c5b75a7c43851d6a7c2656 100644
index 20b537c63e6ac3cc795f9fe3ba72c8197ae95811..4f7fa1bb899d5846230439c8d36e4d6cfa625b54 100644
--- a/services/network/public/cpp/cors/cors.cc
+++ b/services/network/public/cpp/cors/cors.cc
@@ -449,6 +449,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) {
@@ -457,6 +457,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) {
"sec-ch-ua-mobile",
"sec-ch-ua-full-version",
"sec-ch-ua-platform-version",
Expand Down