Merge pull request #3893 from brave/78.0.3904.97

Upgrade patches from Chromium 78.0.3904.87 to Chromium 78.0.3904.97
brave · Nov 8, 2019 · e40dc27 · e40dc27
1 parent 5c0d881
commit e40dc27
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 26 deletions.
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -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=72
 +PATCH=121
diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch
@@ -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];

diff --git a/patches/content-renderer-media-android-media_player_renderer_client.cc.patch b/patches/content-renderer-media-android-media_player_renderer_client.cc.patch