| Index: content/common/push_messaging_messages.h
|
| diff --git a/content/common/push_messaging_messages.h b/content/common/push_messaging_messages.h
|
| index 73c11fe08b5fa5ec8c1c66925eb206a2c8ea3664..40175d0af2e48928d20ed401a2f138aa72a1108e 100644
|
| --- a/content/common/push_messaging_messages.h
|
| +++ b/content/common/push_messaging_messages.h
|
| @@ -15,11 +15,11 @@
|
|
|
| #define IPC_MESSAGE_START PushMessagingMsgStart
|
|
|
| -IPC_ENUM_TRAITS_MAX_VALUE(content::PushRegistrationStatus,
|
| - content::PUSH_REGISTRATION_STATUS_LAST)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(content::PushSubscriptionStatus,
|
| + content::PUSH_SUBSCRIPTION_STATUS_LAST)
|
|
|
| -IPC_ENUM_TRAITS_MAX_VALUE(content::PushGetRegistrationStatus,
|
| - content::PUSH_GETREGISTRATION_STATUS_LAST)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(content::PushGetSubscriptionStatus,
|
| + content::PUSH_GETSUBSCRIPTION_STATUS_LAST)
|
|
|
| IPC_ENUM_TRAITS_MAX_VALUE(
|
| blink::WebPushPermissionStatus,
|
| @@ -31,41 +31,41 @@ IPC_ENUM_TRAITS_MAX_VALUE(
|
|
|
| // Messages sent from the browser to the child process.
|
|
|
| -IPC_MESSAGE_ROUTED3(PushMessagingMsg_RegisterFromDocumentSuccess,
|
| +IPC_MESSAGE_ROUTED3(PushMessagingMsg_SubscribeFromDocumentSuccess,
|
| int32_t /* request_id */,
|
| GURL /* push_endpoint */,
|
| - std::string /* push_registration_id */)
|
| + std::string /* push_subscription_id */)
|
|
|
| -IPC_MESSAGE_CONTROL3(PushMessagingMsg_RegisterFromWorkerSuccess,
|
| +IPC_MESSAGE_CONTROL3(PushMessagingMsg_SubscribeFromWorkerSuccess,
|
| int32_t /* request_id */,
|
| GURL /* push_endpoint */,
|
| - std::string /* push_registration_id */)
|
| + std::string /* push_subscription_id */)
|
|
|
| -IPC_MESSAGE_ROUTED2(PushMessagingMsg_RegisterFromDocumentError,
|
| +IPC_MESSAGE_ROUTED2(PushMessagingMsg_SubscribeFromDocumentError,
|
| int32_t /* request_id */,
|
| - content::PushRegistrationStatus /* status */)
|
| + content::PushSubscriptionStatus /* status */)
|
|
|
| -IPC_MESSAGE_CONTROL2(PushMessagingMsg_RegisterFromWorkerError,
|
| +IPC_MESSAGE_CONTROL2(PushMessagingMsg_SubscribeFromWorkerError,
|
| int32_t /* request_id */,
|
| - content::PushRegistrationStatus /* status */)
|
| + content::PushSubscriptionStatus /* status */)
|
|
|
| -IPC_MESSAGE_CONTROL2(PushMessagingMsg_UnregisterSuccess,
|
| +IPC_MESSAGE_CONTROL2(PushMessagingMsg_UnsubscribeSuccess,
|
| int32_t /* request_id */,
|
| - bool /* did_unregister */)
|
| + bool /* did_unsubscribe */)
|
|
|
| -IPC_MESSAGE_CONTROL3(PushMessagingMsg_UnregisterError,
|
| +IPC_MESSAGE_CONTROL3(PushMessagingMsg_UnsubscribeError,
|
| int32_t /* request_id */,
|
| blink::WebPushError::ErrorType /* error_type */,
|
| std::string /* error_message */)
|
|
|
| -IPC_MESSAGE_CONTROL3(PushMessagingMsg_GetRegistrationSuccess,
|
| +IPC_MESSAGE_CONTROL3(PushMessagingMsg_GetSubscriptionSuccess,
|
| int32_t /* request_id */,
|
| GURL /* push_endpoint */,
|
| - std::string /* push_registration_id */)
|
| + std::string /* push_subscription_id */)
|
|
|
| -IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetRegistrationError,
|
| +IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetSubscriptionError,
|
| int32_t /* request_id */,
|
| - content::PushGetRegistrationStatus /* status */)
|
| + content::PushGetSubscriptionStatus /* status */)
|
|
|
| IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetPermissionStatusSuccess,
|
| int32_t /* request_id */,
|
| @@ -76,23 +76,23 @@ IPC_MESSAGE_CONTROL1(PushMessagingMsg_GetPermissionStatusError,
|
|
|
| // Messages sent from the child process to the browser.
|
|
|
| -IPC_MESSAGE_CONTROL5(PushMessagingHostMsg_RegisterFromDocument,
|
| +IPC_MESSAGE_CONTROL5(PushMessagingHostMsg_SubscribeFromDocument,
|
| int32_t /* render_frame_id */,
|
| int32_t /* request_id */,
|
| std::string /* sender_id */,
|
| bool /* user_visible */,
|
| int64_t /* service_worker_registration_id */)
|
|
|
| -IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_RegisterFromWorker,
|
| +IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_SubscribeFromWorker,
|
| int32_t /* request_id */,
|
| int64_t /* service_worker_registration_id */,
|
| bool /* user_visible */)
|
|
|
| -IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_Unregister,
|
| +IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_Unsubscribe,
|
| int32_t /* request_id */,
|
| int64_t /* service_worker_registration_id */)
|
|
|
| -IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_GetRegistration,
|
| +IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_GetSubscription,
|
| int32_t /* request_id */,
|
| int64_t /* service_worker_registration_id */)
|
|
|
|
|