Introduce a new API to handle native notification clicks

chrome/browser/notifications/notification_platform_bridge_mac.mm

 // Copyright 2015 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.
 
 #include "chrome/browser/notifications/notification_platform_bridge_mac.h"
 
 #include <utility>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/notifications/native_notification_display_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_common.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_builder_mac.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"
 #import "chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.h"
@@ skipping 16 matching lines @@
 // notification#icon in NSUserNotification.contentImage (10.9)
 // Site settings button is implemented as NSUserNotification's action button
 // Not possible to implement:
 // -notification.requireInteraction
 // -The event associated to the close button
 
 // TODO(miguelg) implement the following features
 // - Sound names can be implemented by setting soundName in NSUserNotification
 //   NSUserNotificationDefaultSoundName gives you the platform default.
 
+namespace {
+// Callback to run once the profile has been loaded in order to perform a

[Peter Beverloo, 2016/07/05 14:25:35]

micro nit: blank line above here

[Miguel Garcia, 2016/07/05 17:12:53]

Done.

+// given |operation| in a notification.
+void ProfileLoadedCallback(NotificationCommon::Operation operation,
+                           NotificationCommon::Type notification_type,
+                           const std::string& origin,
+                           const std::string& notification_id,
+                           int action_index,
+                           Profile* profile) {
+  if (!profile) {
+    // TODO(miguelg): Add UMA for this condition.
+    // Perhaps propagate this through PersistentNotificationStatus.
+    LOG(WARNING) << "Profile not loaded correctly";
+    return;
+  }
+
+  NotificationDisplayService* display_service =
+      NotificationDisplayServiceFactory::GetForProfile(profile);
+
+  static_cast<NativeNotificationDisplayService*>(display_service)
+      ->ProcessNotificationOperation(operation, notification_type, origin,
+                                     notification_id, action_index);
+}
+
+}  // namespace
 
 // static
 NotificationPlatformBridge* NotificationPlatformBridge::Create() {
   return new NotificationPlatformBridgeMac(
       [NSUserNotificationCenter defaultUserNotificationCenter]);
 }
 
 // A Cocoa class that represents the delegate of NSUserNotificationCenter and
 // can forward commands to C++.
 @interface NotificationCenterDelegate
@@ skipping 10 matching lines @@
   [notification_center_ setDelegate:delegate_.get()];
 }
 
 NotificationPlatformBridgeMac::~NotificationPlatformBridgeMac() {
   [notification_center_ setDelegate:nil];
 
   // TODO(miguelg) lift this restriction if possible.
   [notification_center_ removeAllDeliveredNotifications];
 }
 
-void NotificationPlatformBridgeMac::Display(const std::string& notification_id,
-                                            const std::string& profile_id,
-                                            bool incognito,
-                                            const Notification& notification) {
+void NotificationPlatformBridgeMac::Display(
+    NotificationCommon::Type notification_type,
+    const std::string& notification_id,
+    const std::string& profile_id,
+    bool incognito,
+    const Notification& notification) {
   base::scoped_nsobject<NotificationBuilder> builder(
       [[NotificationBuilder alloc] init]);
 
   [builder setTitle:base::SysUTF16ToNSString(notification.title())];
   [builder setContextMessage:base::SysUTF16ToNSString(notification.message())];
 
   base::string16 subtitle =
       notification.context_message().empty()
           ? url_formatter::FormatOriginForSecurityDisplay(
                 url::Origin(notification.origin_url()),
@@ skipping 36 matching lines @@
           break;
         }
       }
     }
   }
 
   [builder setOrigin:base::SysUTF8ToNSString(notification.origin_url().spec())];
   [builder setNotificationId:base::SysUTF8ToNSString(notification_id)];
   [builder setProfileId:base::SysUTF8ToNSString(profile_id)];
   [builder setIncognito:incognito];
+  [builder setNotificationType:[NSNumber numberWithInteger:notification_type]];
 
   NSUserNotification* toast = [builder buildUserNotification];
   [notification_center_ deliverNotification:toast];
 }
 
 void NotificationPlatformBridgeMac::Close(const std::string& profile_id,
                                           const std::string& notification_id) {
   NSString* candidate_id = base::SysUTF8ToNSString(notification_id);
 
   NSString* current_profile_id = base::SysUTF8ToNSString(profile_id);
   for (NSUserNotification* toast in
        [notification_center_ deliveredNotifications]) {
     NSString* toast_id =
         [toast.userInfo objectForKey:notification_constants::kNotificationId];
 
     NSString* persistent_profile_id = [toast.userInfo
         objectForKey:notification_constants::kNotificationProfileId];
+
     if ([toast_id isEqualToString:candidate_id] &&
         [persistent_profile_id isEqualToString:current_profile_id]) {
       [notification_center_ removeDeliveredNotification:toast];
     }
   }
 }
 
 bool NotificationPlatformBridgeMac::GetDisplayed(
     const std::string& profile_id,
     bool incognito,
@@ skipping 18 matching lines @@
 }
 
 // static
 bool NotificationPlatformBridgeMac::VerifyNotificationData(
     NSDictionary* response) {
   if (![response
           objectForKey:notification_constants::kNotificationButtonIndex] ||
       ![response objectForKey:notification_constants::kNotificationOperation] ||
       ![response objectForKey:notification_constants::kNotificationId] ||
       ![response objectForKey:notification_constants::kNotificationProfileId] ||
-      ![response objectForKey:notification_constants::kNotificationIncognito]) {
+      ![response objectForKey:notification_constants::kNotificationIncognito] ||
+      ![response objectForKey:notification_constants::kNotificationType]) {
     LOG(ERROR) << "Missing required key";
     return false;
   }
 
   NSNumber* button_index =
       [response objectForKey:notification_constants::kNotificationButtonIndex];
   NSNumber* operation =
       [response objectForKey:notification_constants::kNotificationOperation];
   NSString* notification_id =
       [response objectForKey:notification_constants::kNotificationId];
   NSString* profile_id =
       [response objectForKey:notification_constants::kNotificationProfileId];
+  NSNumber* notification_type =
+      [response objectForKey:notification_constants::kNotificationType];
 
   if (button_index.intValue < -1 ||
       button_index.intValue >=
           static_cast<int>(blink::kWebNotificationMaxActions)) {
     LOG(ERROR) << "Invalid number of buttons supplied "
                << button_index.intValue;
     return false;
   }
 
   if (operation.unsignedIntValue > NotificationCommon::OPERATION_MAX) {
     LOG(ERROR) << operation.unsignedIntValue
                << " does not correspond to a valid operation.";
     return false;
   }
 
   if (notification_id.length <= 0) {
     LOG(ERROR) << "Notification Id is empty";
     return false;
   }
 
   if (profile_id.length <= 0) {
-    LOG(ERROR) << "Profile Id is empty";
+    LOG(ERROR) << "ProfileId not provided";

[Peter Beverloo, 2016/07/05 14:25:35]

Bad merge?

[Miguel Garcia, 2016/07/05 17:12:53]

Yeah sorry.

     return false;
   }
 
+  if (notification_type.unsignedIntValue > NotificationCommon::TYPE_MAX) {
+    LOG(ERROR) << notification_type.unsignedIntValue
+               << " Does not correspond to a valid operation.";
+    return false;
+  }
+
   // Origin is not actually required but if it's there it should be a valid one.
   NSString* origin =
       [response objectForKey:notification_constants::kNotificationOrigin];
   if (origin) {
     std::string notificationOrigin = base::SysNSStringToUTF8(origin);
     GURL url(notificationOrigin);
     if (!url.is_valid())
       return false;
   }
 
@@ skipping 14 matching lines @@
       [response objectForKey:notification_constants::kNotificationButtonIndex];
   NSNumber* operation =
       [response objectForKey:notification_constants::kNotificationOperation];
 
   std::string notificationOrigin = base::SysNSStringToUTF8(
       [response objectForKey:notification_constants::kNotificationOrigin]);
   NSString* notificationId =
       [response objectForKey:notification_constants::kNotificationId];
   std::string persistentNotificationId =
       base::SysNSStringToUTF8(notificationId);
-  int64_t persistentId;
-  if (!base::StringToInt64(persistentNotificationId, &persistentId)) {
-    LOG(ERROR) << "Unable to convert notification ID: "
-               << persistentNotificationId << " to integer.";
-    return;
-  }
   std::string profileId = base::SysNSStringToUTF8(
       [response objectForKey:notification_constants::kNotificationProfileId]);
   NSNumber* isIncognito =
       [response objectForKey:notification_constants::kNotificationIncognito];
+  NSNumber* notificationType =
+      [response objectForKey:notification_constants::kNotificationType];
 
-  GURL origin(notificationOrigin);
+  ProfileManager* profileManager = g_browser_process->profile_manager();
+  DCHECK(profileManager);
 
-  PlatformNotificationServiceImpl::GetInstance()
-      ->ProcessPersistentNotificationOperation(
-          static_cast<NotificationCommon::Operation>(operation.intValue),
-          profileId, [isIncognito boolValue], origin, persistentId,
-          buttonIndex.intValue);
+  profileManager->LoadProfile(
+      profileId, [isIncognito boolValue],
+      base::Bind(
+          &ProfileLoadedCallback, static_cast<NotificationCommon::Operation>(
+                                      operation.unsignedIntValue),
+          static_cast<NotificationCommon::Type>(
+              notificationType.unsignedIntValue),
+          notificationOrigin, persistentNotificationId, buttonIndex.intValue));
 }
 
 - (BOOL)userNotificationCenter:(NSUserNotificationCenter*)center
      shouldPresentNotification:(NSUserNotification*)nsNotification {
   // Always display notifications, regardless of whether the app is foreground.
   return YES;
 }
 
 @end