Introduce a new API to handle native notification clicks

chrome/browser/ui/cocoa/notifications/notification_builder_mac_unittest.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 <AppKit/AppKit.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
+#include "chrome/browser/notifications/notification_common.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_builder_mac.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(NotificationBuilderMacTest, TestNotificationNoButtons) {
   base::scoped_nsobject<NotificationBuilder> builder(
       [[NotificationBuilder alloc] init]);
   [builder setTitle:@"Title"];
   [builder setSubTitle:@"https://www.miguel.com"];
   [builder setContextMessage:@""];
   [builder setTag:@"tag1"];
   [builder setIcon:[NSImage imageNamed:@"NSApplicationIcon"]];
   [builder setNotificationId:@"notificationId"];
   [builder setProfileId:@"profileId"];
   [builder setIncognito:false];
+  [builder
+      setNotificationType:[NSNumber
+                              numberWithInt:static_cast<
+                                                NotificationCommon::Type>(1)]];

[Peter Beverloo, 2016/07/05 23:44:18]

wait what? why not:

[builder setNotificationType:[NSNumber
numberWithInt:NotificationCommon::PERSISTENT]];

(dito in notification_response_builder_mac_unittest.mm)

[Miguel Garcia, 2016/07/07 11:02:29]

Removed the static_cast. The indenting is decided by git cl format .

 
   NSUserNotification* notification = [builder buildUserNotification];
   EXPECT_EQ("Title", base::SysNSStringToUTF8([notification title]));
   EXPECT_EQ(nullptr, [notification informativeText]);
   EXPECT_EQ("https://www.miguel.com",
             base::SysNSStringToUTF8([notification subtitle]));
   EXPECT_EQ("tag1",
             base::SysNSStringToUTF8([notification valueForKey:@"identifier"]));
 
   EXPECT_TRUE([notification hasActionButton]);
   EXPECT_EQ("Settings",
             base::SysNSStringToUTF8([notification actionButtonTitle]));
   EXPECT_EQ("Close", base::SysNSStringToUTF8([notification otherButtonTitle]));
 }
 
 TEST(NotificationBuilderMacTest, TestNotificationOneButton) {
   base::scoped_nsobject<NotificationBuilder> builder(
       [[NotificationBuilder alloc] init]);
   [builder setTitle:@"Title"];
   [builder setSubTitle:@"https://www.miguel.com"];
   [builder setContextMessage:@"SubTitle"];
   [builder setButtons:@"Button1" secondaryButton:@""];
   [builder setNotificationId:@"notificationId"];
   [builder setProfileId:@"profileId"];
   [builder setIncognito:false];
+  [builder
+      setNotificationType:[NSNumber
+                              numberWithInt:static_cast<
+                                                NotificationCommon::Type>(0)]];
 
   NSUserNotification* notification = [builder buildUserNotification];
 
   EXPECT_EQ("Title", base::SysNSStringToUTF8([notification title]));
   EXPECT_EQ("SubTitle",
             base::SysNSStringToUTF8([notification informativeText]));
   EXPECT_EQ("https://www.miguel.com",
             base::SysNSStringToUTF8([notification subtitle]));
 
   EXPECT_TRUE([notification hasActionButton]);
@@ skipping 11 matching lines @@
 TEST(NotificationBuilderMacTest, TestNotificationTwoButtons) {
   base::scoped_nsobject<NotificationBuilder> builder(
       [[NotificationBuilder alloc] init]);
   [builder setTitle:@"Title"];
   [builder setSubTitle:@"https://www.miguel.com"];
   [builder setContextMessage:@"SubTitle"];
   [builder setButtons:@"Button1" secondaryButton:@"Button2"];
   [builder setNotificationId:@"notificationId"];
   [builder setProfileId:@"profileId"];
   [builder setIncognito:false];
+  [builder
+      setNotificationType:[NSNumber
+                              numberWithInt:static_cast<
+                                                NotificationCommon::Type>(0)]];
 
   NSUserNotification* notification = [builder buildUserNotification];
 
   EXPECT_EQ("Title", base::SysNSStringToUTF8([notification title]));
   EXPECT_EQ("SubTitle",
             base::SysNSStringToUTF8([notification informativeText]));
   EXPECT_EQ("https://www.miguel.com",
             base::SysNSStringToUTF8([notification subtitle]));
 
   EXPECT_TRUE([notification hasActionButton]);
@@ skipping 10 matching lines @@
 }
 
 TEST(NotificationBuilderMacTest, TestUserInfo) {
   base::scoped_nsobject<NotificationBuilder> builder(
       [[NotificationBuilder alloc] init]);
   [builder setTitle:@"Title"];
   [builder setProfileId:@"Profile1"];
   [builder setOrigin:@"https://www.miguel.com"];
   [builder setNotificationId:@"Notification1"];
   [builder setIncognito:true];
+  [builder
+      setNotificationType:[NSNumber
+                              numberWithInt:static_cast<
+                                                NotificationCommon::Type>(0)]];
 
   NSUserNotification* notification = [builder buildUserNotification];
   EXPECT_EQ("Title", base::SysNSStringToUTF8([notification title]));
 
   NSDictionary* userInfo = [notification userInfo];
 
   EXPECT_EQ("https://www.miguel.com",
             base::SysNSStringToUTF8([userInfo
                 objectForKey:notification_constants::kNotificationOrigin]));
   EXPECT_EQ("Notification1",
@@ skipping 10 matching lines @@
   NSDictionary* notificationData;
   {
     base::scoped_nsobject<NotificationBuilder> sourceBuilder(
         [[NotificationBuilder alloc] init]);
     [sourceBuilder setTitle:@"Title"];
     [sourceBuilder setSubTitle:@"https://www.miguel.com"];
     [sourceBuilder setContextMessage:@"SubTitle"];
     [sourceBuilder setNotificationId:@"notificationId"];
     [sourceBuilder setProfileId:@"profileId"];
     [sourceBuilder setIncognito:false];
+    [sourceBuilder
+        setNotificationType:
+            [NSNumber numberWithInt:static_cast<NotificationCommon::Type>(1)]];
     notificationData = [sourceBuilder buildDictionary];
   }
   base::scoped_nsobject<NotificationBuilder> finalBuilder(
       [[NotificationBuilder alloc] initWithDictionary:notificationData]);
 
   NSUserNotification* notification = [finalBuilder buildUserNotification];
 
   EXPECT_EQ("Title", base::SysNSStringToUTF8([notification title]));
   EXPECT_EQ("SubTitle",
             base::SysNSStringToUTF8([notification informativeText]));
   EXPECT_EQ("https://www.miguel.com",
             base::SysNSStringToUTF8([notification subtitle]));
 }