Implement notificationclose event

content/browser/notifications/notification_event_dispatcher_impl.cc

 // Copyright 2014 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 "content/browser/notifications/notification_event_dispatcher_impl.h"
 
 #include "base/callback.h"
 #include "build/build_config.h"
 #include "content/browser/notifications/platform_notification_context_impl.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
@@ skipping 77 matching lines @@
   // the user clicking on them. It should be removed once that's fixed.
   LOG(INFO) << "Trying to dispatch notification for SW with status: "
             << service_worker_status << " action_index: " << action_index;
 #endif
   if (service_worker_status == SERVICE_WORKER_OK) {
     base::Callback<void(ServiceWorkerStatusCode)> dispatch_event_callback =
         base::Bind(&NotificationClickEventFinished, dispatch_complete_callback,
                    service_worker_registration);
 
     DCHECK(service_worker_registration->active_version());
-    service_worker_registration->active_version()
-        ->DispatchNotificationClickEvent(
-            dispatch_event_callback, notification_database_data.notification_id,
-            notification_database_data.notification_data, action_index);
+    // TODO(nsatragno): refactor this class to avoid passing whether it's a
+    // close or click notification through the action_index.
+    if (action_index == -2) {

[Nina, 2016/01/21 13:55:36]

This is the thing I like the least about my CL. This class seems to expect its
functions will only be called for NotificationClick events and binds the
callback in a way it's difficult to reuse its code.

Right now DispatchNotification*Event binds ReadNotificationDatabaseData, which
binds FindServiceWorkerRegistration, which binds
DispatchNotificationClickEventOnRegistration. Maybe we should add a parameter to
the callback stack to let FindServiceWorkerRegistration call either
DispatchNotificationClickOnRegistration or
DispatchNotificationCloseEventOnRegistration?

+      service_worker_registration->active_version()
+          ->DispatchNotificationCloseEvent(
+              dispatch_event_callback,
+              notification_database_data.notification_id,
+              notification_database_data.notification_data);
+    } else {
+      service_worker_registration->active_version()
+          ->DispatchNotificationClickEvent(
+              dispatch_event_callback,
+              notification_database_data.notification_id,
+              notification_database_data.notification_data, action_index);
+    }
     return;
   }
 
   PersistentNotificationStatus status = PERSISTENT_NOTIFICATION_STATUS_SUCCESS;
   switch (service_worker_status) {
     case SERVICE_WORKER_ERROR_NOT_FOUND:
       status = PERSISTENT_NOTIFICATION_STATUS_NO_SERVICE_WORKER;
       break;
     case SERVICE_WORKER_ERROR_FAILED:
     case SERVICE_WORKER_ERROR_ABORT:
@@ skipping 111 matching lines @@
       static_cast<PlatformNotificationContextImpl*>(
           partition->GetPlatformNotificationContext());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ReadNotificationDatabaseData, persistent_notification_id,
                  origin, action_index, dispatch_complete_callback,
                  service_worker_context, notification_context));
 }
 
+void NotificationEventDispatcherImpl::DispatchNotificationCloseEvent(
+    BrowserContext* browser_context,
+    int64_t persistent_notification_id,
+    const GURL& origin,
+    const NotificationClickDispatchCompleteCallback&
+        dispatch_complete_callback) {
+  DispatchNotificationClickEvent(browser_context, persistent_notification_id,
+                                 origin, -2, dispatch_complete_callback);
+}
+
 }  // namespace content