Chromium Code Reviews| 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 01ca9418ba3188196f7f6e0ea622d663ebfb83ca..e07145f4376a836262f1ebb84a63e97c9a73c05b 100644 |
| --- a/content/common/service_worker/service_worker_messages.h |
| +++ b/content/common/service_worker/service_worker_messages.h |
| @@ -487,11 +487,16 @@ IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_ActivateEvent, |
| IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_ExtendableMessageEvent, |
| int /* request_id */, |
| ServiceWorkerMsg_ExtendableMessageEvent_Params) |
| -IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_NotificationClickEvent, |
| +IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_FetchEvent, |
| + int /* response_id */, |
| + int /* event_finish_id */, |
| + 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
|
| +IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_NotificationClickEvent, |
| int /* request_id */, |
| std::string /* notification_id */, |
| content::PlatformNotificationData /* notification_data */, |
| - int /* action_index */) |
| + int /* action_index */, |
| + base::NullableString16 /* notification reply */) |
| IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_NotificationCloseEvent, |
| int /* request_id */, |
| std::string /* notification_id */, |