Integrate the notification database with the normal code path.

chrome/browser/notifications/platform_notification_service_impl.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 CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_
 #define CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_
 
+#include <stdint.h>
+#include <map>
+
 #include "base/gtest_prod_util.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/notifications/notification.h"
 #include "content/public/browser/platform_notification_service.h"
 #include "content/public/common/persistent_notification_status.h"
 
 class NotificationDelegate;
 class NotificationUIManager;
 class Profile;
 
 namespace gcm {
 class PushMessagingBrowserTest;
 }
 
 // The platform notification service is the profile-agnostic entry point through
 // which Web Notifications can be controlled.
 class PlatformNotificationServiceImpl
     : public content::PlatformNotificationService {
  public:
   // Returns the active instance of the service in the browser process. Safe to
   // be called from any thread.
   static PlatformNotificationServiceImpl* GetInstance();
 
-  // To be called when a persistent notification has been clicked on. The
-  // Service Worker associated with the registration will be started if
-  // needed, on which the event will be fired. Must be called on the UI thread.
-  void OnPersistentNotificationClick(
-      content::BrowserContext* browser_context,
-      int64 service_worker_registration_id,
-      const std::string& notification_id,
-      const GURL& origin,
-      const content::PlatformNotificationData& notification_data,
-      const base::Callback<void(content::PersistentNotificationStatus)>&
-          callback) const;
-
   // Returns the Notification UI Manager through which notifications can be
   // displayed to the user. Can be overridden for testing.
   NotificationUIManager* GetNotificationUIManager() const;
 
   // content::PlatformNotificationService implementation.
   blink::WebNotificationPermission CheckPermissionOnUIThread(
       content::BrowserContext* browser_context,
       const GURL& origin,
       int render_process_id) override;
   blink::WebNotificationPermission CheckPermissionOnIOThread(
       content::ResourceContext* resource_context,
       const GURL& origin,
       int render_process_id) override;
   void DisplayNotification(
       content::BrowserContext* browser_context,
       const GURL& origin,
       const SkBitmap& icon,
       const content::PlatformNotificationData& notification_data,
       scoped_ptr<content::DesktopNotificationDelegate> delegate,
       base::Closure* cancel_callback) override;
   void DisplayPersistentNotification(
       content::BrowserContext* browser_context,
-      int64 service_worker_registration_id,
+      int64_t persistent_notification_id,
       const GURL& origin,
       const SkBitmap& icon,
       const content::PlatformNotificationData& notification_data) override;
   void ClosePersistentNotification(
       content::BrowserContext* browser_context,
-      const std::string& persistent_notification_id) override;
+      int64_t persistent_notification_id) override;
 
  private:
   friend struct DefaultSingletonTraits<PlatformNotificationServiceImpl>;
   friend class PlatformNotificationServiceBrowserTest;
   friend class PlatformNotificationServiceTest;
   friend class PushMessagingBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(
       PlatformNotificationServiceTest, DisplayNameForOrigin);
   FRIEND_TEST_ALL_PREFIXES(PlatformNotificationServiceTest,
                            TestWebOriginDisplayName);
@@ skipping 24 matching lines @@
   // Translates a URL into a slightly more readable version that may omit
   // the port and scheme for common cases.
   // TODO(dewittj): Remove this when the proper function is implemented in a
   // chrome/browser/ui library function.  See crbug.com/402698.
   static base::string16 WebOriginDisplayName(const GURL& origin,
                                              const std::string& languages);
 
   // Weak reference. Ownership maintains with the test.
   NotificationUIManager* notification_ui_manager_for_tests_;
 
+  // Mapping between a persistent notification id and the id of the associated
+  // message_center::Notification object. Must only be used on the UI thread.
+  std::map<int64_t, std::string> persistent_notifications_;
+
   DISALLOW_COPY_AND_ASSIGN(PlatformNotificationServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_