OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // Message definition file, included multiple times, hence no include guard. | 5 // Message definition file, included multiple times, hence no include guard. |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" |
13 #include "content/common/service_worker/service_worker_client_info.h" | 13 #include "content/common/service_worker/service_worker_client_info.h" |
14 #include "content/common/service_worker/service_worker_status_code.h" | 14 #include "content/common/service_worker/service_worker_status_code.h" |
15 #include "content/common/service_worker/service_worker_types.h" | 15 #include "content/common/service_worker/service_worker_types.h" |
16 #include "content/public/common/message_port_types.h" | 16 #include "content/public/common/message_port_types.h" |
17 #include "content/public/common/navigator_connect_client.h" | 17 #include "content/public/common/navigator_connect_client.h" |
18 #include "content/public/common/platform_notification_data.h" | 18 #include "content/public/common/platform_notification_data.h" |
| 19 #include "content/public/common/push_event_payload.h" |
19 #include "ipc/ipc_message_macros.h" | 20 #include "ipc/ipc_message_macros.h" |
20 #include "ipc/ipc_param_traits.h" | 21 #include "ipc/ipc_param_traits.h" |
21 #include "third_party/WebKit/public/platform/WebCircularGeofencingRegion.h" | 22 #include "third_party/WebKit/public/platform/WebCircularGeofencingRegion.h" |
22 #include "third_party/WebKit/public/platform/WebGeofencingEventType.h" | 23 #include "third_party/WebKit/public/platform/WebGeofencingEventType.h" |
23 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor
kerError.h" | 24 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor
kerError.h" |
24 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor
kerEventResult.h" | 25 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor
kerEventResult.h" |
25 #include "url/gurl.h" | 26 #include "url/gurl.h" |
26 | 27 |
27 #undef IPC_MESSAGE_EXPORT | 28 #undef IPC_MESSAGE_EXPORT |
28 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 29 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 | 127 |
127 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebGeofencingEventType, | 128 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebGeofencingEventType, |
128 blink::WebGeofencingEventTypeLast) | 129 blink::WebGeofencingEventTypeLast) |
129 | 130 |
130 IPC_STRUCT_TRAITS_BEGIN(content::NavigatorConnectClient) | 131 IPC_STRUCT_TRAITS_BEGIN(content::NavigatorConnectClient) |
131 IPC_STRUCT_TRAITS_MEMBER(target_url) | 132 IPC_STRUCT_TRAITS_MEMBER(target_url) |
132 IPC_STRUCT_TRAITS_MEMBER(origin) | 133 IPC_STRUCT_TRAITS_MEMBER(origin) |
133 IPC_STRUCT_TRAITS_MEMBER(message_port_id) | 134 IPC_STRUCT_TRAITS_MEMBER(message_port_id) |
134 IPC_STRUCT_TRAITS_END() | 135 IPC_STRUCT_TRAITS_END() |
135 | 136 |
| 137 IPC_STRUCT_TRAITS_BEGIN(content::PushEventPayload) |
| 138 IPC_STRUCT_TRAITS_MEMBER(data_) |
| 139 IPC_STRUCT_TRAITS_MEMBER(is_null_) |
| 140 IPC_STRUCT_TRAITS_END() |
| 141 |
136 //--------------------------------------------------------------------------- | 142 //--------------------------------------------------------------------------- |
137 // Messages sent from the child process to the browser. | 143 // Messages sent from the child process to the browser. |
138 | 144 |
139 IPC_MESSAGE_CONTROL5(ServiceWorkerHostMsg_RegisterServiceWorker, | 145 IPC_MESSAGE_CONTROL5(ServiceWorkerHostMsg_RegisterServiceWorker, |
140 int /* thread_id */, | 146 int /* thread_id */, |
141 int /* request_id */, | 147 int /* request_id */, |
142 int /* provider_id */, | 148 int /* provider_id */, |
143 GURL /* scope */, | 149 GURL /* scope */, |
144 GURL /* script_url */) | 150 GURL /* script_url */) |
145 | 151 |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
437 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_FetchEvent, | 443 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_FetchEvent, |
438 int /* request_id */, | 444 int /* request_id */, |
439 content::ServiceWorkerFetchRequest) | 445 content::ServiceWorkerFetchRequest) |
440 IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_NotificationClickEvent, | 446 IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_NotificationClickEvent, |
441 int /* request_id */, | 447 int /* request_id */, |
442 int64_t /* persistent_notification_id */, | 448 int64_t /* persistent_notification_id */, |
443 content::PlatformNotificationData /* notification_data */, | 449 content::PlatformNotificationData /* notification_data */, |
444 int /* action_index */) | 450 int /* action_index */) |
445 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_PushEvent, | 451 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_PushEvent, |
446 int /* request_id */, | 452 int /* request_id */, |
447 std::string /* data */) | 453 content::PushEventPayload /* data */) |
448 IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_GeofencingEvent, | 454 IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_GeofencingEvent, |
449 int /* request_id */, | 455 int /* request_id */, |
450 blink::WebGeofencingEventType /* event_type */, | 456 blink::WebGeofencingEventType /* event_type */, |
451 std::string /* region_id */, | 457 std::string /* region_id */, |
452 blink::WebCircularGeofencingRegion /* region */) | 458 blink::WebCircularGeofencingRegion /* region */) |
453 IPC_MESSAGE_CONTROL3( | 459 IPC_MESSAGE_CONTROL3( |
454 ServiceWorkerMsg_MessageToWorker, | 460 ServiceWorkerMsg_MessageToWorker, |
455 base::string16 /* message */, | 461 base::string16 /* message */, |
456 std::vector<content::TransferredMessagePort> /* sent_message_ports */, | 462 std::vector<content::TransferredMessagePort> /* sent_message_ports */, |
457 std::vector<int> /* new_routing_ids */) | 463 std::vector<int> /* new_routing_ids */) |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 | 501 |
496 // Sent via EmbeddedWorker as a response of NavigateClient. | 502 // Sent via EmbeddedWorker as a response of NavigateClient. |
497 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_NavigateClientResponse, | 503 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_NavigateClientResponse, |
498 int /* request_id */, | 504 int /* request_id */, |
499 content::ServiceWorkerClientInfo /* client */) | 505 content::ServiceWorkerClientInfo /* client */) |
500 | 506 |
501 // Sent via EmbeddedWorker as an error response of NavigateClient. | 507 // Sent via EmbeddedWorker as an error response of NavigateClient. |
502 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_NavigateClientError, | 508 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_NavigateClientError, |
503 int /* request_id */, | 509 int /* request_id */, |
504 GURL /* url */) | 510 GURL /* url */) |
OLD | NEW |