Chromium Code Reviews| 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> |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 480 ServiceWorkerMsg_MessageToDocument_Params) | 480 ServiceWorkerMsg_MessageToDocument_Params) |
| 481 | 481 |
| 482 // Sent via EmbeddedWorker to dispatch events. | 482 // Sent via EmbeddedWorker to dispatch events. |
| 483 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_InstallEvent, | 483 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_InstallEvent, |
| 484 int /* request_id */) | 484 int /* request_id */) |
| 485 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_ActivateEvent, | 485 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_ActivateEvent, |
| 486 int /* request_id */) | 486 int /* request_id */) |
| 487 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_ExtendableMessageEvent, | 487 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_ExtendableMessageEvent, |
| 488 int /* request_id */, | 488 int /* request_id */, |
| 489 ServiceWorkerMsg_ExtendableMessageEvent_Params) | 489 ServiceWorkerMsg_ExtendableMessageEvent_Params) |
| 490 IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_NotificationClickEvent, | 490 IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_FetchEvent, |
| 491 int /* response_id */, | |
| 492 int /* event_finish_id */, | |
| 493 content::ServiceWorkerFetchRequest) | |
|
Peter Beverloo
2016/10/12 13:58:31
bad merge?
awdf
2016/10/12 17:04:01
Oops, yes, I thought that it had been added in the
| |
| 494 IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_NotificationClickEvent, | |
| 491 int /* request_id */, | 495 int /* request_id */, |
| 492 std::string /* notification_id */, | 496 std::string /* notification_id */, |
| 493 content::PlatformNotificationData /* notification_data */, | 497 content::PlatformNotificationData /* notification_data */, |
| 494 int /* action_index */) | 498 int /* action_index */, |
| 499 base::NullableString16 /* notification reply */) | |
| 495 IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_NotificationCloseEvent, | 500 IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_NotificationCloseEvent, |
| 496 int /* request_id */, | 501 int /* request_id */, |
| 497 std::string /* notification_id */, | 502 std::string /* notification_id */, |
| 498 content::PlatformNotificationData /* notification_data */) | 503 content::PlatformNotificationData /* notification_data */) |
| 499 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_PushEvent, | 504 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_PushEvent, |
| 500 int /* request_id */, | 505 int /* request_id */, |
| 501 content::PushEventPayload /* data */) | 506 content::PushEventPayload /* data */) |
| 502 | 507 |
| 503 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_DidSkipWaiting, | 508 IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_DidSkipWaiting, |
| 504 int /* request_id */) | 509 int /* request_id */) |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 539 | 544 |
| 540 // Sent via EmbeddedWorker as a response of NavigateClient. | 545 // Sent via EmbeddedWorker as a response of NavigateClient. |
| 541 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_NavigateClientResponse, | 546 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_NavigateClientResponse, |
| 542 int /* request_id */, | 547 int /* request_id */, |
| 543 content::ServiceWorkerClientInfo /* client */) | 548 content::ServiceWorkerClientInfo /* client */) |
| 544 | 549 |
| 545 // Sent via EmbeddedWorker as an error response of NavigateClient. | 550 // Sent via EmbeddedWorker as an error response of NavigateClient. |
| 546 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_NavigateClientError, | 551 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_NavigateClientError, |
| 547 int /* request_id */, | 552 int /* request_id */, |
| 548 GURL /* url */) | 553 GURL /* url */) |
| OLD | NEW |