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 101.0.4951.54 to Chromium 101.0.4951.61 (1.38.release3) #13274

Merged
merged 4 commits into from
May 10, 2022
Merged

Upgrade from Chromium 101.0.4951.54 to Chromium 101.0.4951.61 (1.38.release3) #13274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5181fc
Upgrade from Chromium 101.0.4951.54 to Chromium 101.0.4951.61
brave-browser-releases May 10, 2022
0d2dc0e
Upgrade patches from Chromium 101.0.4951.54 to Chromium 101.0.4951.61
brave-browser-releases May 10, 2022
4c9c7b2
1.38.112
brave-browser-releases May 10, 2022
742463b
1.38.113
brave-browser-releases May 10, 2022
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "brave-core",
"version": "1.38.111",
"version": "1.38.113",
"description": "Brave Core is a set of changes, APIs and scripts used for customizing Chromium to make Brave.",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -255,7 +255,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "101.0.4951.54",
"tag": "101.0.4951.61",
"repository": {
"url": "https://github.com/chromium/chromium"
}
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 6e93d84600ea6f7d37631c6a004a82933d5fa440..39ecdc15cd5193f824f1ba8d1854d79256af4d38 100644
index 6c410103c3933c79647d299f2397299ae2553657..f1ede4bd2ba87c0ac90e9938d734bdfdc7461dc3 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4253,6 +4253,7 @@ if (is_android) {
@@ -4254,6 +4254,7 @@ if (is_android) {
"android/java/src/org/chromium/base/task/TaskTraits.java",
"android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
]
Expand Down
6 changes: 3 additions & 3 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 f847b4f7d7a07cc3f72734e0422d51929cea50d0..b37fd0b57f4aa72327865c454a75820414dcea71 100644
index d83b3e3d8ebe439487ad7d9972d59d5e11d8a958..61ecf746dba7b7446cd2deaa6031223ce9400631 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=101
-MINOR=0
-BUILD=4951
-PATCH=54
-PATCH=61
+MINOR=1
+BUILD=38
+PATCH=111
+PATCH=113
2 changes: 1 addition & 1 deletion patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.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/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
index a36c8c594bc6553a200f589ac13a389b374d0b63..0e0841fe9befc760ecf096fe8bcfbd5223953669 100644
index a8c5880fdf7a9939a5e7ca226d8923d3ec75d72e..316b16758b6767b3a5b509045aaa8ca56f18c6a9 100644
--- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
+++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
@@ -140,6 +140,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
Expand Down