Add support for native extension notifications

chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"
 
 namespace {
@@ skipping 27 matching lines @@
       objectForKey:notification_constants::kNotificationProfileId]);
   NSString* profileId = [[notification userInfo]
       objectForKey:notification_constants::kNotificationProfileId];
 
   DCHECK([[notification userInfo]
       objectForKey:notification_constants::kNotificationIncognito]);
   NSNumber* incognito = [[notification userInfo]
       objectForKey:notification_constants::kNotificationIncognito];
   NSNumber* notificationType = [[notification userInfo]
       objectForKey:notification_constants::kNotificationType];
+  NSNumber* hasSettingsButton = [[notification userInfo]
+      objectForKey:notification_constants::kNotificationHasSettingsButton];
 
   // Closed notifications are not activated.
   NotificationOperation operation =
       notification.activationType == NSUserNotificationActivationTypeNone
           ? NOTIFICATION_CLOSE
           : NOTIFICATION_CLICK;
   int buttonIndex = -1;
 
   // Determine whether the user clicked on a button, and if they did, whether it
-  // was a developer-provided button or the mandatory Settings button.
+  // was a developer-provided button or the  Settings button.
   if (notification.activationType ==
       NSUserNotificationActivationTypeActionButtonClicked) {
     NSArray* alternateButtons = @[];
     if ([notification
             respondsToSelector:@selector(_alternateActionButtonTitles)]) {
       alternateButtons =
           [notification valueForKey:@"_alternateActionButtonTitles"];
     }
 
-    bool multipleButtons = (alternateButtons.count > 0);
+    BOOL settingsButtonRequired = [hasSettingsButton boolValue];
+    BOOL multipleButtons = (alternateButtons.count > 0);
 
     // No developer actions, just the settings button.
     if (!multipleButtons) {
+      DCHECK(settingsButtonRequired);
       operation = NOTIFICATION_SETTINGS;
       buttonIndex = -1;
     } else {
       // 0 based array containing.
       // Button 1
       // Button 2 (optional)
-      // Settings
+      // Settings (if required)
       NSNumber* actionIndex =
           [notification valueForKey:@"_alternateActionIndex"];
-      operation = (actionIndex.unsignedLongValue == alternateButtons.count - 1)
+      operation = settingsButtonRequired && (actionIndex.unsignedLongValue ==
+                                             alternateButtons.count - 1)
                       ? NOTIFICATION_SETTINGS
                       : NOTIFICATION_CLICK;
-      buttonIndex =
-          (actionIndex.unsignedLongValue == alternateButtons.count - 1)
-              ? -1
-              : actionIndex.intValue;
+      buttonIndex = settingsButtonRequired && (actionIndex.unsignedLongValue ==
+                                               alternateButtons.count - 1)

[Peter Beverloo, 2017/04/07 16:19:05]

nit: this would become a lot easier to read if you'd extract an `isLastButton`
local:

BOOL isLastButton = actionIndex.unsignedLongValue == alternateButtons.count - 1;

+                        ? -1
+                        : actionIndex.intValue;
     }
   }
 
   return @{
     notification_constants::kNotificationOrigin : origin,
     notification_constants::kNotificationId : notificationId,
     notification_constants::kNotificationProfileId : profileId,
     notification_constants::kNotificationIncognito : incognito,
     notification_constants::kNotificationType : notificationType,
     notification_constants::
     kNotificationOperation : [NSNumber numberWithInt:operation],
     notification_constants::
     kNotificationButtonIndex : [NSNumber numberWithInt:buttonIndex],
   };
 }
 
 @end