Introduce a new API to handle native notification clicks

chrome/browser/notifications/native_notification_display_service.cc

Index: chrome/browser/notifications/native_notification_display_service.cc
diff --git a/chrome/browser/notifications/native_notification_display_service.cc b/chrome/browser/notifications/native_notification_display_service.cc
index 64f71b00238cacad1d30630ad94ff8594e719547..aba44e425b5e213c528cd433e35a1a9e4f017ead 100644
--- a/chrome/browser/notifications/native_notification_display_service.cc
+++ b/chrome/browser/notifications/native_notification_display_service.cc
@@ -4,9 +4,14 @@
 
 #include "chrome/browser/notifications/native_notification_display_service.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/notifications/in_page_notification_handler.h"
 #include "chrome/browser/notifications/notification.h"
+#include "chrome/browser/notifications/notification_delegate.h"
+#include "chrome/browser/notifications/notification_handler.h"
 #include "chrome/browser/notifications/notification_platform_bridge.h"
+#include "chrome/browser/notifications/persistent_notification_handler.h"
 #include "chrome/browser/profiles/profile.h"
 
 namespace {
@@ -29,21 +34,39 @@ NativeNotificationDisplayService::NativeNotificationDisplayService(
     : profile_(profile), notification_bridge_(notification_bridge) {
   DCHECK(profile_);
   DCHECK(notification_bridge_);
+
+  std::unique_ptr<InPageNotificationHandler> in_page(
+      new InPageNotificationHandler());
+  std::unique_ptr<PersistentNotificationHandler> persistent(
+      new PersistentNotificationHandler());
+
+  AddNotificationHandler(in_page->NotificationType(), std::move(in_page));
+  AddNotificationHandler(persistent->NotificationType(), std::move(persistent));
 }
 
-NativeNotificationDisplayService::~NativeNotificationDisplayService() {}
+NativeNotificationDisplayService::~NativeNotificationDisplayService() {
+  notification_handlers_.clear();
+}
 
 void NativeNotificationDisplayService::Display(
+    notification_operation_common::NotificationHandlerType notification_type,
     const std::string& notification_id,
     const Notification& notification) {
-  notification_bridge_->Display(notification_id, GetProfileId(profile_),
+  notification_bridge_->Display(notification_type, notification_id,
+                                GetProfileId(profile_),
                                 profile_->IsOffTheRecord(), notification);
   notification.delegate()->Display();
+  NotificationHandler* handler = GetNotificationHandler(notification_type);
+  handler->RegisterNotification(
+      notification_id, base::WrapUnique(new Notification(notification)));
 }
 
 void NativeNotificationDisplayService::Close(
+    notification_operation_common::NotificationHandlerType notification_type,
     const std::string& notification_id) {
+  NotificationHandler* handler = GetNotificationHandler(notification_type);
   notification_bridge_->Close(GetProfileId(profile_), notification_id);
+  handler->CloseNotification(profile_, notification_id);
 }
 
 bool NativeNotificationDisplayService::GetDisplayed(
@@ -52,6 +75,38 @@ bool NativeNotificationDisplayService::GetDisplayed(
       GetProfileId(profile_), profile_->IsOffTheRecord(), notifications);
 }
 
+void NativeNotificationDisplayService::ProcessNotificationOperation(
+    notification_operation_common::NotificationOperation operation,
+    notification_operation_common::NotificationHandlerType notification_type,
+    const std::string& origin,
+    const std::string& notification_id,
+    int action_index) {
+  NotificationHandler* handler = GetNotificationHandler(notification_type);
+  handler->HandleNotificationOperation(operation, profile_, origin,
+                                       notification_id, action_index);
+}
+
+void NativeNotificationDisplayService::AddNotificationHandler(
+    notification_operation_common::NotificationHandlerType notification_type,
+    std::unique_ptr<NotificationHandler> handler) {
+  DCHECK(handler);
+  DCHECK_EQ(notification_handlers_.count(notification_type), 0u);
+  notification_handlers_[notification_type] = std::move(handler);
+}
+
+void NativeNotificationDisplayService::RemoveNotificationHandler(
+    notification_operation_common::NotificationHandlerType notification_type) {
+  notification_handlers_.erase(notification_type);
+}
+
+NotificationHandler* NativeNotificationDisplayService::GetNotificationHandler(
+    notification_operation_common::NotificationHandlerType notification_type) {
+  DCHECK(notification_handlers_.find(notification_type) !=
+         notification_handlers_.end())
+      << notification_type << " NOT REGISTERED";
+  return notification_handlers_[notification_type].get();
+}
+
 bool NativeNotificationDisplayService::SupportsNotificationCenter() const {
   return notification_bridge_->SupportsNotificationCenter();
 }