Merge the code paths for closing different kinds of notifications.

third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h

Index: third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h
diff --git a/third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h b/third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h
index 5c77233e2320a4fbea7d8a069d44734d8900ceed..db31466f0fab122e42968c47534b299ed46ff112 100644
--- a/third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h
+++ b/third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h
@@ -7,15 +7,18 @@
 
 namespace blink {
 
+class WebString;
+
 // A delegate through which the embedder can trigger events on a Document-bound
 // Web Notifications object. Service Worker-bound Web Notifications will not have
 // a delegate, as their events will be fired on a Service Worker instead.
 class WebNotificationDelegate {
 public:
-    virtual void dispatchClickEvent() = 0;
-    virtual void dispatchShowEvent() = 0;
+    virtual void didShowNotification(const WebString& notificationId) = 0;
+    virtual void didClickNotification() = 0;
+    virtual void didCloseNotification() = 0;
+
     virtual void dispatchErrorEvent() = 0;

[johnme, 2016/09/23 16:14:58]

Remove this from WebNotificationDelegate. It's only called from
Notification.cpp, so it can become a private method of Notification.

[Peter Beverloo, 2016/10/04 10:27:23]

Done.

-    virtual void dispatchCloseEvent() = 0;
 };
 
 } // namespace blink