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 1a5c2083a12ab7d06eaf8c9f41adc9a0d75a0ef0..cabd977d0b5fd04a5e9a1ad58adfc4bc9b049338 100644 |
--- a/content/common/service_worker/service_worker_messages.h |
+++ b/content/common/service_worker/service_worker_messages.h |
@@ -9,7 +9,9 @@ |
#include "base/strings/string16.h" |
#include "content/common/navigator_connect_types.h" |
+#include "content/common/service_worker/service_worker_client_info.h" |
#include "content/common/service_worker/service_worker_status_code.h" |
+#include "content/common/service_worker/service_worker_traits.h" |
#include "content/common/service_worker/service_worker_types.h" |
#include "content/public/common/platform_notification_data.h" |
#include "ipc/ipc_message_macros.h" |
@@ -103,14 +105,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerVersionAttributes) |
IPC_STRUCT_TRAITS_MEMBER(active) |
IPC_STRUCT_TRAITS_END() |
-IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerClientInfo) |
- IPC_STRUCT_TRAITS_MEMBER(client_id) |
- IPC_STRUCT_TRAITS_MEMBER(page_visibility_state) |
- IPC_STRUCT_TRAITS_MEMBER(is_focused) |
- IPC_STRUCT_TRAITS_MEMBER(url) |
- IPC_STRUCT_TRAITS_MEMBER(frame_type) |
-IPC_STRUCT_TRAITS_END() |
- |
IPC_ENUM_TRAITS_MAX_VALUE( |
blink::WebServiceWorkerCacheError, |
blink::WebServiceWorkerCacheErrorLast) |
@@ -227,15 +221,6 @@ IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_FocusClient, |
int /* request_id */, |
int /* client_id */) |
-// Response to ServiceWorkerMsg_GetClientInfo. |
-IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_GetClientInfoSuccess, |
- int /* request_id */, |
- content::ServiceWorkerClientInfo) |
- |
-// Response to ServiceWorkerMsg_GetClientInfo. |
-IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_GetClientInfoError, |
- int /* request_id */) |
- |
// Asks the browser to force this worker to become activated. |
IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_SkipWaiting, |
int /* request_id */) |
@@ -390,13 +375,6 @@ IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_MessageToDocument, |
std::vector<int> /* sent_message_port_ids */, |
std::vector<int> /* new_routing_ids */) |
-// Sent to client documents to request document properties. |
-IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_GetClientInfo, |
- int /* thread_id */, |
- int /* embedded_worker_id */, |
- int /* request_id */, |
- int /* provider_id */) |
- |
// Sent via EmbeddedWorker to dispatch events. |
IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_InstallEvent, |
int /* request_id */, |