| Index: content/common/service_worker/service_worker_messages.h
|
| diff --git a/content/common/service_worker/service_worker_messages.h b/content/common/service_worker/service_worker_messages.h
|
| index 92a67773dfe6133aa8abb494435076a93d4cda56..f274cd718bb8712ced6a3da14b5c68874c22ba0b 100644
|
| --- a/content/common/service_worker/service_worker_messages.h
|
| +++ b/content/common/service_worker/service_worker_messages.h
|
| @@ -19,6 +19,7 @@
|
| #include "content/public/common/push_event_payload.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ipc/ipc_param_traits.h"
|
| +#include "mojo/public/cpp/system/message_pipe.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerError.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerEventResult.h"
|
| #include "url/gurl.h"
|
| @@ -329,12 +330,14 @@ IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_DisassociateRegistration,
|
| int /* thread_id */,
|
| int /* provider_id */)
|
|
|
| -// Response to ServiceWorkerHostMsg_RegisterServiceWorker.
|
| -IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_ServiceWorkerRegistered,
|
| +// Response to ServiceWorkerHostMsg_RegisterServiceWorker. The
|
| +// MessagePipeHandle is only used with --enable-network-service.
|
| +IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_ServiceWorkerRegistered,
|
| int /* thread_id */,
|
| int /* request_id */,
|
| content::ServiceWorkerRegistrationObjectInfo,
|
| - content::ServiceWorkerVersionAttributes)
|
| + content::ServiceWorkerVersionAttributes,
|
| + mojo::MessagePipeHandle /* url_loader_factory */)
|
|
|
| // Response to ServiceWorkerHostMsg_UpdateServiceWorker.
|
| IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_ServiceWorkerUpdated,
|
| @@ -347,26 +350,32 @@ IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_ServiceWorkerUnregistered,
|
| int /* request_id */,
|
| bool /* is_success */)
|
|
|
| -// Response to ServiceWorkerHostMsg_GetRegistration.
|
| -IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_DidGetRegistration,
|
| +// Response to ServiceWorkerHostMsg_GetRegistration. The
|
| +// MessagePipeHandle is only used with --enable-network-service.
|
| +IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_DidGetRegistration,
|
| int /* thread_id */,
|
| int /* request_id */,
|
| content::ServiceWorkerRegistrationObjectInfo,
|
| - content::ServiceWorkerVersionAttributes)
|
| + content::ServiceWorkerVersionAttributes,
|
| + mojo::MessagePipeHandle /* url_loader_factory */)
|
|
|
| -// Response to ServiceWorkerHostMsg_GetRegistrations.
|
| -IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_DidGetRegistrations,
|
| +// Response to ServiceWorkerHostMsg_GetRegistrations. The vector of
|
| +// MessagePipeHandles is only used with --enable-network-service.
|
| +IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_DidGetRegistrations,
|
| int /* thread_id */,
|
| int /* request_id */,
|
| std::vector<content::ServiceWorkerRegistrationObjectInfo>,
|
| - std::vector<content::ServiceWorkerVersionAttributes>)
|
| + std::vector<content::ServiceWorkerVersionAttributes>,
|
| + std::vector<mojo::MessagePipeHandle>)
|
|
|
| -// Response to ServiceWorkerHostMsg_GetRegistrationForReady.
|
| -IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_DidGetRegistrationForReady,
|
| +// Response to ServiceWorkerHostMsg_GetRegistrationForReady. The
|
| +// MessagePipeHandle is only used with --enable-network-service.
|
| +IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_DidGetRegistrationForReady,
|
| int /* thread_id */,
|
| int /* request_id */,
|
| content::ServiceWorkerRegistrationObjectInfo,
|
| - content::ServiceWorkerVersionAttributes)
|
| + content::ServiceWorkerVersionAttributes,
|
| + mojo::MessagePipeHandle /* url_loader_factory */)
|
|
|
| // Sent when any kind of registration error occurs during a
|
| // RegisterServiceWorker handler above.
|
|
|