Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1015)

Unified Diff: content/renderer/service_worker/service_worker_script_context.cc

Issue 843583005: [ServiceWorker] Implement WebServiceWorkerContextClient::openWindow(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@content_browser_client_openurl
Patch Set: jochen review comments Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/service_worker/service_worker_script_context.cc
diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc
index 44ee79234da6909aba4e4f599f49d4f19c03c569..d337126fbfa5eb681909b3207809caef7563bd21 100644
--- a/content/renderer/service_worker/service_worker_script_context.cc
+++ b/content/renderer/service_worker/service_worker_script_context.cc
@@ -102,6 +102,10 @@ void ServiceWorkerScriptContext::OnMessageReceived(
OnCrossOriginMessageToWorker)
IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidGetClientDocuments,
OnDidGetClientDocuments)
+ IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowResponse,
+ OnOpenWindowResponse)
+ IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowError,
+ OnOpenWindowError)
IPC_MESSAGE_HANDLER(ServiceWorkerMsg_FocusClientResponse,
OnFocusClientResponse)
IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidSkipWaiting, OnDidSkipWaiting)
@@ -204,6 +208,13 @@ void ServiceWorkerScriptContext::GetClientDocuments(
GetRoutingID(), request_id));
}
+void ServiceWorkerScriptContext::OpenWindow(
+ const GURL& url, blink::WebServiceWorkerClientCallbacks* callbacks) {
+ DCHECK(callbacks);
+ int request_id = pending_client_callbacks_.Add(callbacks);
+ Send(new ServiceWorkerHostMsg_OpenWindow(GetRoutingID(), request_id, url));
+}
+
void ServiceWorkerScriptContext::PostMessageToDocument(
int client_id,
const base::string16& message,
@@ -425,6 +436,43 @@ void ServiceWorkerScriptContext::OnDidGetClientDocuments(
pending_clients_callbacks_.Remove(request_id);
}
+void ServiceWorkerScriptContext::OnOpenWindowResponse(
+ int request_id,
+ const ServiceWorkerClientInfo& client) {
+ TRACE_EVENT0("ServiceWorker",
+ "ServiceWorkerScriptContext::OnOpenWindowResponse");
+ blink::WebServiceWorkerClientCallbacks* callbacks =
+ pending_client_callbacks_.Lookup(request_id);
+ if (!callbacks) {
+ NOTREACHED() << "Got stray response: " << request_id;
+ return;
+ }
+ scoped_ptr<blink::WebServiceWorkerClientInfo> web_client;
+ if (!client.IsEmpty()) {
+ DCHECK(client.IsValid());
+ web_client.reset(new blink::WebServiceWorkerClientInfo(client));
+ }
+ callbacks->onSuccess(web_client.release());
+ pending_client_callbacks_.Remove(request_id);
+}
+
+void ServiceWorkerScriptContext::OnOpenWindowError(int request_id) {
+ TRACE_EVENT0("ServiceWorker",
+ "ServiceWorkerScriptContext::OnOpenWindowError");
+ blink::WebServiceWorkerClientCallbacks* callbacks =
+ pending_client_callbacks_.Lookup(request_id);
+ if (!callbacks) {
+ NOTREACHED() << "Got stray response: " << request_id;
+ return;
+ }
+ scoped_ptr<blink::WebServiceWorkerError> error(
+ new blink::WebServiceWorkerError(
+ blink::WebServiceWorkerError::ErrorTypeUnknown,
+ "Something went wrong while trying to open the window."));
+ callbacks->onError(error.release());
+ pending_client_callbacks_.Remove(request_id);
+}
+
void ServiceWorkerScriptContext::OnFocusClientResponse(int request_id,
bool result) {
TRACE_EVENT0("ServiceWorker",

Powered by Google App Engine
This is Rietveld 408576698