Partial implementation of subscription restrictions.

chrome/browser/push_messaging/push_messaging_service_impl.h

Index: chrome/browser/push_messaging/push_messaging_service_impl.h
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h
index 3b95d2d56dc2fb8082e68cff2e20531eb08bb040..745c5bf6d1b58968812dc258170c0219211bb8ed 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.h
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -26,6 +26,7 @@
 #include "content/public/common/permission_status.mojom.h"
 #include "content/public/common/push_event_payload.h"
 #include "content/public/common/push_messaging_status.h"
+#include "content/public/common/push_subscription_options.h"

[Peter Beverloo, 2016/02/26 16:02:33]

micro nit: could forward declare this

[harkness, 2016/02/26 17:12:04]

Done.

 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"
 
 #if defined(ENABLE_NOTIFICATIONS)
@@ -74,16 +75,14 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
   void SubscribeFromDocument(
       const GURL& requesting_origin,
       int64_t service_worker_registration_id,
-      const std::string& sender_id,
       int renderer_id,
       int render_frame_id,
-      bool user_visible,
+      const content::PushSubscriptionOptions& options,
       const content::PushMessagingService::RegisterCallback& callback) override;
   void SubscribeFromWorker(
       const GURL& requesting_origin,
       int64_t service_worker_registration_id,
-      const std::string& sender_id,
-      bool user_visible,
+      const content::PushSubscriptionOptions& options,
       const content::PushMessagingService::RegisterCallback& callback) override;
   void GetEncryptionInfo(
       const GURL& origin,
@@ -165,7 +164,7 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
 
   void DidRequestPermission(
       const PushMessagingAppIdentifier& app_identifier,
-      const std::string& sender_id,
+      const content::PushSubscriptionOptions& options,
       const content::PushMessagingService::RegisterCallback& callback,
       content::PermissionStatus permission_status);