Reland of Implement support for closing mac native 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 28 matching lines @@
   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];
 
-  // Initialize operation and button index for the case where the
-  // notification itself was clicked.
-  NotificationOperation operation = NOTIFICATION_CLICK;
+  // 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.
   if (notification.activationType ==
       NSUserNotificationActivationTypeActionButtonClicked) {
     NSArray* alternateButtons = @[];
     if ([notification
             respondsToSelector:@selector(_alternateActionButtonTitles)]) {
       alternateButtons =
@@ skipping 30 matching lines @@
     notification_constants::kNotificationIncognito : incognito,
     notification_constants::kNotificationType : notificationType,
     notification_constants::
     kNotificationOperation : [NSNumber numberWithInt:operation],
     notification_constants::
     kNotificationButtonIndex : [NSNumber numberWithInt:buttonIndex],
   };
 }
 
 @end