Merge the code paths for closing different kinds of notifications.

third_party/WebKit/Source/modules/notifications/Notification.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 72 matching lines @@
   ~Notification() override;
 
   void close();
 
   DEFINE_ATTRIBUTE_EVENT_LISTENER(click);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(show);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
 
   // WebNotificationDelegate interface.
-  void dispatchShowEvent() override;
-  void dispatchClickEvent() override;
-  void dispatchErrorEvent() override;
-  void dispatchCloseEvent() override;
+  void didShowNotification(const WebString& notificationId) override;
+  void didClickNotification() override;
+  void didCloseNotification() override;
 
   String title() const;
   String dir() const;
   String lang() const;
   String body() const;
   String tag() const;
   String image() const;
   String icon() const;
   String badge() const;
   NavigatorVibration::VibrationPattern vibrate() const;
@@ skipping 61 matching lines @@
   // Shows the notification through the embedder using the loaded resources.
   void didLoadResources(NotificationResourcesLoader*);
 
   Type m_type;
   State m_state;
 
   WebNotificationData m_data;
 
   String m_notificationId;
 
+  // Whether the developer has requested the notification to be closed whilst
+  // it's still in process of being shown.
+  bool m_requestedClose;
+
   Member<AsyncMethodRunner<Notification>> m_prepareShowMethodRunner;
 
   Member<NotificationResourcesLoader> m_loader;
 };
 
 }  // namespace blink
 
 #endif  // Notification_h