ServiceWorker: plumbing for ClientQueryOptions (2/2, chromium)

content/common/service_worker/service_worker_messages.h

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 f883f37025089e98d4cdc277f60c9e0b15a31e98..22531437aa008b0537bb4d4dc8ae445ed03ede3a 100644
--- a/content/common/service_worker/service_worker_messages.h
+++ b/content/common/service_worker/service_worker_messages.h
@@ -40,6 +40,9 @@ IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerState,
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerResponseType,
                           blink::WebServiceWorkerResponseTypeLast)
 
+IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerClientType,
+                          blink::WebServiceWorkerClientTypeLast)
+
 IPC_ENUM_TRAITS_MAX_VALUE(content::ServiceWorkerProviderType,
                           content::SERVICE_WORKER_PROVIDER_TYPE_LAST)
 
@@ -114,6 +117,12 @@ IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerClientInfo)
   IPC_STRUCT_TRAITS_MEMBER(is_focused)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(frame_type)
+  IPC_STRUCT_TRAITS_MEMBER(client_type)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerClientQueryOptions)
+  IPC_STRUCT_TRAITS_MEMBER(client_type)
+  IPC_STRUCT_TRAITS_MEMBER(include_uncontrolled)

[Tom Sepez, 2015/03/06 17:53:21]

nit: "uncontrolled" is an adjective, I'd like a noun here.  Maybe
include_uncontrolled_clients"?

[kinuko, 2015/03/07 12:11:38]

Yup I agree that a noun'd be better... while this field name is taken from the
spec [1], so I'd like to stick to it to match with it.

[1]
https://slightlyoff.github.io/ServiceWorker/spec/service_worker/#serviceworke...

 IPC_STRUCT_TRAITS_END()
 
 IPC_ENUM_TRAITS_MAX_VALUE(
@@ -225,10 +234,11 @@ IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_CrossOriginConnectEventFinished,
 // Routed to the target ServiceWorkerVersion.
 IPC_MESSAGE_ROUTED0(ServiceWorkerHostMsg_Pong)
 
-// Asks the browser to retrieve documents controlled by the sender
+// Asks the browser to retrieve clients controlled by the sender

[falken, 2015/03/04 07:16:43]

I guess "controlled" is now wrong too, since there's include_uncontrolled.

[kinuko, 2015/03/07 12:11:38]

Done.

 // ServiceWorker.
-IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_GetClientDocuments,
-                    int /* request_id */)
+IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_GetClients,
+                    int /* request_id */,
+                    content::ServiceWorkerClientQueryOptions)
 
 // Sends a 'message' event to a client document (renderer->browser).
 IPC_MESSAGE_ROUTED3(
@@ -474,8 +484,8 @@ IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_ClaimClientsError,
 // Sent via EmbeddedWorker to Ping the worker, expecting a Pong in response.
 IPC_MESSAGE_CONTROL0(ServiceWorkerMsg_Ping)
 
-// Sent via EmbeddedWorker as a response of GetClientDocuments.
-IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_DidGetClientDocuments,
+// Sent via EmbeddedWorker as a response of GetClients.
+IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_DidGetClients,
                      int /* request_id */,
                      std::vector<content::ServiceWorkerClientInfo>)