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

Jump to bottom

Upgrade from Chromium 91.0.4472.57 to Chromium 91.0.4472.70 (1.25.x). #8876

Merged
merged 2 commits into from
May 23, 2021
Merged

Upgrade from Chromium 91.0.4472.57 to Chromium 91.0.4472.70 (1.25.x). #8876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a81b7
Merge pull request #8870 from brave/91.0.4472.70_master_100
kjozwiak May 20, 2021
ab38a63
Merge pull request #8749 from brave/maxk-fix-omnibox-selection-color
mkarolin May 10, 2021
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
2 changes: 2 additions & 0 deletions chromium_src/ui/native_theme/common_theme.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
case NativeTheme::kColorId_LinkEnabled:
case NativeTheme::kColorId_LinkPressed:
return is_dark ? kBraveColorOrange300 : kBraveColorBrand;
case NativeTheme::kColorId_TextfieldSelectionBackgroundFocused:
return is_dark ? gfx::kGoogleBlue800 : gfx::kGoogleBlue200;
default:
break;
}
Expand Down
4 changes: 2 additions & 2 deletions patches/base-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index acaff526ff2d8e1822dca295d7eed55ac8fa677d..dd6a801e83448b1d2c4f03aff94d3932393f7d02 100644
index 7d3506c3587c5c42f19250254295458b8984e118..c93b670d3940a2db6ea135716e56c85e4be4a04a 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -3936,6 +3936,7 @@ if (is_android) {
@@ -3937,6 +3937,7 @@ if (is_android) {
"android/java/src/org/chromium/base/task/TaskTraits.java",
"android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
]
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 291d183829af54da51ffb000e2024e36a9928d24..3975fe26200a91b7a5602821475e884caf7ef8ef 100644
index 6c0b8df16eeb435e2b1b28c48802d944f1f67c22..8bf7d3d9f1d66e25c5fb0967e2a55f2fce23d1f3 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=91
-MINOR=0
-BUILD=4472
-PATCH=57
-PATCH=70
+MINOR=1
+BUILD=25
+PATCH=64
4 changes: 2 additions & 2 deletions patches/chrome-browser-about_flags.cc.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/about_flags.cc b/chrome/browser/about_flags.cc
index e21d38b138415121f233ff98ab99c402b0732c50..cb33c906cea2b08ab85c99a9eb90a13257713573 100644
index f9aea40901ea3172c34b0a62800a6d5350198502..d7bb2c5119cce22422f66d44b30e6a0dd8b15211 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 e21d38b138415121f233ff98ab99c402b0732c50..cb33c906cea2b08ab85c99a9eb90a132

const FeatureEntry::Choice kPassiveListenersChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
@@ -7282,6 +7282,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7287,6 +7287,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
2 changes: 1 addition & 1 deletion patches/chrome-browser-extensions-extension_tab_util.cc.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/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index f4d2ea1b698af613e6fdfd8de3e35d11c83abd58..09da8cdba253c7e35bff3032f7cf2ec066149c0a 100644
index ab9704b8d0836d74b627f669cf7aeea16ea04722..cbcb2aee4470650cc547a7e216ed12828d250cbe 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -792,6 +792,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.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/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 609b5563e99efdf3d4fa7a8e31fd995c6f67f56f..80376a024097d397fc4f614d8026ed9e46070a49 100644
index 905cd3eaba0407d9a4e7003ee05bd00fd651d084..cc4561b1fda0abc7f049ac31ecb48d5cd0409f91 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -375,6 +375,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
Expand Down
2 changes: 1 addition & 1 deletion patches/content-browser-renderer_host-navigation_request.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index bd3a898a230c90aaf6bfd82601ad5279f7b7673e..c708ec8123a2afafea82c48f7996e49b0ffe4a3d 100644
index 6f1fe2a9f91d78924a65dc3c759a17b0c9de669a..732cdee49842bcfdf366ea5c5dac74d07bbf47bc 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -2219,6 +2219,7 @@ void NavigationRequest::OnRequestRedirected(
Expand Down