Implement notificationclose event

chrome/browser/notifications/platform_notification_service_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 "chrome/browser/notifications/platform_notification_service_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 51 matching lines @@
 using message_center::NotifierId;
 
 namespace {
 
 // Invalid id for a renderer process. Used in cases where we need to check for
 // permission without having an associated renderer process yet.
 const int kInvalidRenderProcessId = -1;
 
 // Callback to provide when deleting the data associated with persistent Web
 // Notifications from the notification database.
 void OnPersistentNotificationDataDeleted(bool success) {

[Peter Beverloo, 2016/01/21 14:17:37]

nit: This is unused now.

If we will deprecate the Notifications.PersistentNotificationDataDeleted, you
can use the <obsolete> annotation in histograms.xml.

[Nina, 2016/01/25 14:54:55]

Removed and deprecated histogram.

   UMA_HISTOGRAM_BOOLEAN("Notifications.PersistentNotificationDataDeleted",
       success);
 }
 
+// Callback called when the persistent notification close event has been handled
+// to remove the notification from the database.
+void OnDidSendPersistentNotificationCloseEvent(
+    BrowserContext* browser_context,
+    int64_t persistent_notification_id,
+    const GURL& origin,
+    content::PersistentNotificationStatus status) {
+
+  PlatformNotificationContext* context =
+      BrowserContext::GetStoragePartitionForSite(browser_context, origin)
+          ->GetPlatformNotificationContext();
+
+  // TODO(nsatragno): add Notifications.PersistentWebNotificationCloseResult
+  // metric.
+  BrowserThread::PostTask(

[Peter Beverloo, 2016/01/21 14:17:37]

Since we're already calling into content per DispatchNotificationCloseEvent, we
could remove DeleteNotificationData from the public //content API and instead
just call it directly. (See e.g. the ReadNotificationDatabaseData helper part of
the NotificationEventDispatcherImpl.)

[Nina, 2016/01/25 14:54:55]

Refactored code to avoid this ping - pong between content and browser.

[Peter Beverloo, 2016/01/26 16:13:45]

Note that it's between //chrome and //content - both in the browser process.
It's just layering :-)

[Nina, 2016/01/27 18:48:57]

Acknowledged.

+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&PlatformNotificationContext::DeleteNotificationData,
+                 context,
+                 persistent_notification_id,
+                 origin,
+                 base::Bind(&OnPersistentNotificationDataDeleted)));
+}
+
 // Persistent notifications fired through the delegate do not care about the
 // lifetime of the Service Worker responsible for executing the event.
 void OnEventDispatchComplete(content::PersistentNotificationStatus status) {
   UMA_HISTOGRAM_ENUMERATION(
       "Notifications.PersistentWebNotificationClickResult", status,
       content::PersistentNotificationStatus::
           PERSISTENT_NOTIFICATION_STATUS_MAX);
 }
 
 void CancelNotification(const std::string& id, ProfileID profile_id) {
@@ skipping 125 matching lines @@
 
 void PlatformNotificationServiceImpl::OnPersistentNotificationClose(
     BrowserContext* browser_context,
     int64_t persistent_notification_id,
     const GURL& origin,
     bool by_user) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (by_user) {
     content::RecordAction(base::UserMetricsAction(
         "Notifications.Persistent.ClosedByUser"));
+
+    content::NotificationEventDispatcher::GetInstance()
+        ->DispatchNotificationCloseEvent(
+              browser_context,
+              persistent_notification_id,
+              origin,
+              base::Bind(&OnDidSendPersistentNotificationCloseEvent,
+                         browser_context,
+                         persistent_notification_id,
+                         origin));
   } else {
     content::RecordAction(base::UserMetricsAction(
         "Notifications.Persistent.ClosedProgrammatically"));
   }
-
-  PlatformNotificationContext* context =
-      BrowserContext::GetStoragePartitionForSite(browser_context, origin)
-          ->GetPlatformNotificationContext();
-
-  BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&PlatformNotificationContext::DeleteNotificationData,
-                 context,
-                 persistent_notification_id,
-                 origin,
-                 base::Bind(&OnPersistentNotificationDataDeleted)));
 }
 
 blink::WebNotificationPermission
 PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
     BrowserContext* browser_context,
     const GURL& origin,
     int render_process_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
@@ skipping 297 matching lines @@
         extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
             origin.host(), extensions::ExtensionRegistry::EVERYTHING);
     DCHECK(extension);
 
     return base::UTF8ToUTF16(extension->name());
   }
 #endif
 
   return base::string16();
 }