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 #3893

Merged
merged 1 commit into from
Nov 8, 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..fbc1cc921ac8bb5a8d8eb164d51e20e3d940b58a 100644
index 628bbf0d999e7b263af28d18afdcaa8cdc67fefd..546dd103ce4c4f732367600b2e9373e13e996521 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=78
MINOR=0
-BUILD=3904
-PATCH=87
-PATCH=97
+BUILD=74
+PATCH=4
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm
index f4e3046614e13837050edf3862d66bccee3cc9e1..724e1a39cdfe950d6ce933f630195a273f35c7e8 100644
index 53c1005044d101029550842c460d76f52a975feb..02f2e95997176c766e31e62fe8cf695cb47bb545 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(
+ notification_type == NotificationHandler::Type::BRAVE_ADS ? IDS_VIEW_MENU_MAC :
IDS_NOTIFICATION_BUTTON_SETTINGS)]);

[builder
@@ -300,6 +301,7 @@ void NotificationPlatformBridgeMac::Display(
@@ -306,6 +307,7 @@ void NotificationPlatformBridgeMac::Display(
} else {
NSUserNotification* toast = [builder buildUserNotification];
[notification_center_ deliverNotification:toast];
Expand Down

This file was deleted.