| Index: content/renderer/service_worker/service_worker_script_context.h
|
| diff --git a/content/renderer/service_worker/service_worker_script_context.h b/content/renderer/service_worker/service_worker_script_context.h
|
| index b8953f7cb37db135538efe8160f0ea16e369d496..0ccf2dca7bb8c082b4f1dc1decfe978ff41d18ce 100644
|
| --- a/content/renderer/service_worker/service_worker_script_context.h
|
| +++ b/content/renderer/service_worker/service_worker_script_context.h
|
| @@ -69,6 +69,9 @@ class ServiceWorkerScriptContext {
|
| void DidHandleCrossOriginConnectEvent(int request_id, bool accept_connection);
|
| void GetClientDocuments(
|
| blink::WebServiceWorkerClientsCallbacks* callbacks);
|
| + void OpenWindow(const GURL& url,
|
| + const GURL& referrer,
|
| + blink::WebServiceWorkerClientCallbacks* callbacks);
|
| void PostMessageToDocument(
|
| int client_id,
|
| const base::string16& message,
|
| @@ -95,6 +98,8 @@ class ServiceWorkerScriptContext {
|
| private:
|
| typedef IDMap<blink::WebServiceWorkerClientsCallbacks, IDMapOwnPointer>
|
| ClientsCallbacksMap;
|
| + typedef IDMap<blink::WebServiceWorkerClientCallbacks, IDMapOwnPointer>
|
| + ClientCallbacksMap;
|
| typedef IDMap<blink::WebServiceWorkerClientFocusCallback, IDMapOwnPointer>
|
| FocusClientCallbacksMap;
|
| typedef IDMap<blink::WebServiceWorkerSkipWaitingCallbacks, IDMapOwnPointer>
|
| @@ -125,6 +130,10 @@ class ServiceWorkerScriptContext {
|
| const std::vector<int>& new_routing_ids);
|
| void OnDidGetClientDocuments(
|
| int request_id, const std::vector<ServiceWorkerClientInfo>& clients);
|
| + void OnOpenWindowResponse(int request_id,
|
| + const ServiceWorkerClientInfo& client,
|
| + bool dummy_client);
|
| + void OnOpenWindowError(int request_id);
|
| void OnFocusClientResponse(int request_id, bool result);
|
| void OnDidSkipWaiting(int request_id);
|
|
|
| @@ -144,6 +153,9 @@ class ServiceWorkerScriptContext {
|
| // Pending callbacks for GetClientDocuments().
|
| ClientsCallbacksMap pending_clients_callbacks_;
|
|
|
| + // Pending callbacks for OpenWindow().
|
| + ClientCallbacksMap pending_client_callbacks_;
|
| +
|
| // Pending callbacks for FocusClient().
|
| FocusClientCallbacksMap pending_focus_client_callbacks_;
|
|
|
|
|