Partial implementation of subscription restrictions.

content/common/push_messaging_messages.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.
 
 // IPC messages for push messaging.
 // Multiply-included message file, hence no include guard.
 
 #include <stdint.h>
 
 #include "content/public/common/push_messaging_status.h"
+#include "content/public/common/push_subscription_options.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"
 #include "url/gurl.h"
 
 #define IPC_MESSAGE_START PushMessagingMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(content::PushRegistrationStatus,
                           content::PUSH_REGISTRATION_STATUS_LAST)
 
 IPC_ENUM_TRAITS_MAX_VALUE(content::PushGetRegistrationStatus,
                           content::PUSH_GETREGISTRATION_STATUS_LAST)
 
 IPC_ENUM_TRAITS_MAX_VALUE(
     blink::WebPushPermissionStatus,
     blink::WebPushPermissionStatus::WebPushPermissionStatusLast)
 
 IPC_ENUM_TRAITS_MAX_VALUE(
     blink::WebPushError::ErrorType,
     blink::WebPushError::ErrorType::ErrorTypeLast)
 
+IPC_STRUCT_TRAITS_BEGIN(content::PushSubscriptionOptions)
+  IPC_STRUCT_TRAITS_MEMBER(user_visible_only)
+  IPC_STRUCT_TRAITS_MEMBER(sender_info)
+IPC_STRUCT_TRAITS_END()
+
 // Messages sent from the browser to the child process.
 
 IPC_MESSAGE_ROUTED4(PushMessagingMsg_SubscribeFromDocumentSuccess,
                     int32_t /* request_id */,
                     GURL /* push_endpoint */,
                     std::vector<uint8_t> /* p256dh */,
                     std::vector<uint8_t> /* auth */)
 
 IPC_MESSAGE_CONTROL4(PushMessagingMsg_SubscribeFromWorkerSuccess,
                      int32_t /* request_id */,
@@ skipping 31 matching lines @@
 IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetPermissionStatusSuccess,
                      int32_t /* request_id */,
                      blink::WebPushPermissionStatus /* status */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetPermissionStatusError,
                      int32_t /* request_id */,
                      blink::WebPushError::ErrorType /* error_type */)
 
 // Messages sent from the child process to the browser.
 
-IPC_MESSAGE_CONTROL5(PushMessagingHostMsg_SubscribeFromDocument,
+IPC_MESSAGE_CONTROL4(PushMessagingHostMsg_SubscribeFromDocument,
                      int32_t /* render_frame_id */,
                      int32_t /* request_id */,
-                     std::string /* sender_id */,
-                     bool /* user_visible */,
+                     content::PushSubscriptionOptions /* options */,
                      int64_t /* service_worker_registration_id */)
 
 IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_SubscribeFromWorker,
                      int32_t /* request_id */,
                      int64_t /* service_worker_registration_id */,
-                     bool /* user_visible */)
+                     content::PushSubscriptionOptions /* options */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_Unsubscribe,
                      int32_t /* request_id */,
                      int64_t /* service_worker_registration_id */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_GetSubscription,
                      int32_t /* request_id */,
                      int64_t /* service_worker_registration_id */)
 
 IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_GetPermissionStatus,
                      int32_t /* request_id */,
                      int64_t /* service_worker_registration_id */,
                      bool /* user_visible */)