Merge the code paths for closing different kinds of notifications.

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

 // 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.
 
 #ifndef WebNotificationDelegate_h
 #define WebNotificationDelegate_h
 
 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
 
 #endif // WebNotificationDelegate_h