Push API: Forced notifications should use Notifications database

chrome/browser/push_messaging/push_messaging_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_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/push_messaging_service.h"
 #include "content/public/common/push_messaging_status.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"
 
 class Profile;
 class PushMessagingApplicationId;
 
-namespace user_prefs {
-class PrefRegistrySyncable;
+namespace content {
+struct NotificationDatabaseData;
+struct PlatformNotificationData;
 }
 
 namespace gcm {
 class GCMDriver;
 class GCMProfileService;
 }
 
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
 class PushMessagingServiceImpl : public content::PushMessagingService,
                                  public gcm::GCMAppHandler,
                                  public content_settings::Observer,
                                  public KeyedService {
  public:
   // Register profile-specific prefs for GCM.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // If any Service Workers are using push, starts GCM and adds an app handler.
   static void InitializeForProfile(Profile* profile);
@@ skipping 66 matching lines @@
                               const base::Closure& message_handled_closure,
                               content::PushDeliveryStatus status);
 
   // Developers are required to display a Web Notification in response to an
   // incoming push message in order to clarify to the user that something has
   // happened in the background. When they forget to do so, display a default
   // notification on their behalf.
   void RequireUserVisibleUX(const GURL& requesting_origin,
                             int64 service_worker_registration_id,
                             const base::Closure& message_handled_closure);
+
+  static void DidGetNotificationsShowingIOProxy(

[Peter Beverloo, 2015/04/30 11:11:42]

Since they're not being explicitly tested by anything, these methods could be
file-private anonymous functions.

[johnme, 2015/04/30 13:30:12]

Sadly not, as they post to private methods of PMSI (that I'd rather not make
public).

+      const base::WeakPtr<PushMessagingServiceImpl>& ui_weak_ptr,
+      const GURL& requesting_origin,
+      int64 service_worker_registration_id,

[Peter Beverloo, 2015/04/30 11:11:42]

int64 -> int64_t

[johnme, 2015/04/30 13:30:12]

Done (ditto elsewhere that this patch touches).

+      const base::Closure& message_handled_closure,
+      bool success,
+      const std::vector<content::NotificationDatabaseData>& data);
+
+  void DidGetNotificationsShowing(

[Peter Beverloo, 2015/04/30 11:11:42]

Perhaps "DidGetNotificationsFromDatabase" would be clearer, since having both
"DidGetNotificationsShow{n,ing}" is ambiguous.

[johnme, 2015/04/30 13:30:12]

Done (I also renamed DidGetNotificationsShown to
DidGetNotificationsShownAndNeeded).

+      const GURL& requesting_origin,
+      int64 service_worker_registration_id,
+      const base::Closure& message_handled_closure,
+      bool success,
+      const std::vector<content::NotificationDatabaseData>& data);
+
   void DidGetNotificationsShown(
       const GURL& requesting_origin,
       int64 service_worker_registration_id,
       bool notification_shown,
       bool notification_needed,
       const base::Closure& message_handled_closure,
       const std::string& data,
       bool success,
       bool not_found);
 
+  static void DidWriteNotificationDataIOProxy(
+      const base::WeakPtr<PushMessagingServiceImpl>& ui_weak_ptr,
+      const GURL& requesting_origin,
+      const content::PlatformNotificationData& notification_data,
+      const base::Closure& message_handled_closure,
+      bool success,
+      int64_t persistent_notification_id);
+
+  void DidWriteNotificationData(
+      const GURL& requesting_origin,
+      const content::PlatformNotificationData& notification_data,
+      const base::Closure& message_handled_closure,
+      bool success,
+      int64_t persistent_notification_id);
+
   // Register methods ----------------------------------------------------------
 
   void RegisterEnd(
       const content::PushMessagingService::RegisterCallback& callback,
       const std::string& registration_id,
       content::PushRegistrationStatus status);
 
   void DidRegister(
       const PushMessagingApplicationId& application_id,
       const content::PushMessagingService::RegisterCallback& callback,
@@ skipping 37 matching lines @@
 
   base::Closure message_callback_for_testing_;
   base::Closure content_setting_changed_callback_for_testing_;
 
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_