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 78.0.3904.87 to Chromium 78.0.3904.97 (0.70.x) #3904

Merged
merged 1 commit into from
Nov 7, 2019
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
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 4327edd56870d864b524bbfb32661707e67b02d1..7053c00f0b55e4acc2d7df15081338eb348eaea1 100644
index 628bbf0d999e7b263af28d18afdcaa8cdc67fefd..b2a83fd0eeb55d00e6790d528e87769992905ddb 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=78
MINOR=0
-BUILD=3904
-PATCH=87
-PATCH=97
+BUILD=70
+PATCH=122
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm
index f4e3046614e13837050edf3862d66bccee3cc9e1..e982932589cbb24d486b41fb02e031abaf59f15f 100644
index 53c1005044d101029550842c460d76f52a975feb..c1e330179eb2433355095125fcd0b296a1eefeb3 100644
--- a/chrome/browser/notifications/notification_platform_bridge_mac.mm
+++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm
@@ -226,6 +226,7 @@ void NotificationPlatformBridgeMac::Display(
@@ -232,6 +232,7 @@ void NotificationPlatformBridgeMac::Display(
initWithCloseLabel:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_CLOSE)
optionsLabel:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_MORE)
settingsLabel:l10n_util::GetNSString(
Expand Down