ServiceWorker: Implement navigate() method in WindowClient (chromium side).

content/renderer/service_worker/service_worker_context_client.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/service_worker/service_worker_context_client.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 245 matching lines @@
                         OnCrossOriginMessageToWorker)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_SendStashedMessagePorts,
                         OnSendStashedMessagePorts)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidGetClients, OnDidGetClients)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowResponse,
                         OnOpenWindowResponse)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowError,
                         OnOpenWindowError)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_FocusClientResponse,
                         OnFocusClientResponse)
+    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_NavigateClientResponse,
+                        OnNavigateClientResponse)
+    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_NavigateClientError,
+                        OnNavigateClientError)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidSkipWaiting, OnDidSkipWaiting)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidClaimClients, OnDidClaimClients)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ClaimClientsError, OnClaimClientsError)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_Ping, OnPing);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
 }
 
 void ServiceWorkerContextClient::BindServiceRegistry(
@@ skipping 298 matching lines @@
 
 void ServiceWorkerContextClient::focus(
     const blink::WebString& uuid,
     blink::WebServiceWorkerClientCallbacks* callback) {
   DCHECK(callback);
   int request_id = context_->client_callbacks.Add(callback);
   Send(new ServiceWorkerHostMsg_FocusClient(GetRoutingID(), request_id,
                                             base::UTF16ToUTF8(uuid)));
 }
 
+void ServiceWorkerContextClient::navigate(
+    const blink::WebString& uuid,
+    const blink::WebURL& url,
+    blink::WebServiceWorkerClientCallbacks* callback) {
+  DCHECK(callback);
+  int request_id = context_->client_callbacks.Add(callback);
+  Send(new ServiceWorkerHostMsg_NavigateClient(GetRoutingID(), request_id,
+                                               base::UTF16ToUTF8(uuid), url));
+}
+
 void ServiceWorkerContextClient::skipWaiting(
     blink::WebServiceWorkerSkipWaitingCallbacks* callbacks) {
   DCHECK(callbacks);
   int request_id = context_->skip_waiting_callbacks.Add(callbacks);
   Send(new ServiceWorkerHostMsg_SkipWaiting(GetRoutingID(), request_id));
 }
 
 void ServiceWorkerContextClient::claim(
     blink::WebServiceWorkerClientsClaimCallbacks* callbacks) {
   DCHECK(callbacks);
@@ skipping 272 matching lines @@
     scoped_ptr<blink::WebServiceWorkerError> error(
         new blink::WebServiceWorkerError(
             blink::WebServiceWorkerError::ErrorTypeNotFound,
             "The WindowClient was not found."));
     callback->onError(error.release());
   }
 
   context_->client_callbacks.Remove(request_id);
 }
 
+void ServiceWorkerContextClient::OnNavigateClientResponse(
+    int request_id,
+    const ServiceWorkerClientInfo& client) {
+  TRACE_EVENT0("ServiceWorker",
+               "ServiceWorkerContextClient::OnNavigateClientResponse");
+  blink::WebServiceWorkerClientCallbacks* callbacks =
+      context_->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(
+        ToWebServiceWorkerClientInfo(client)));
+  }
+  callbacks->onSuccess(web_client.release());
+  context_->client_callbacks.Remove(request_id);
+}
+
+void ServiceWorkerContextClient::OnNavigateClientError(int request_id,
+                                                       const GURL& url) {
+  TRACE_EVENT0("ServiceWorker",
+               "ServiceWorkerContextClient::OnNavigateClientError");
+  blink::WebServiceWorkerClientCallbacks* callbacks =
+      context_->client_callbacks.Lookup(request_id);
+  if (!callbacks) {
+    NOTREACHED() << "Got stray response: " << request_id;
+    return;
+  }
+  std::string message;

[palmer, 2015/07/27 21:55:58]

I might simplify this error message, and also disambiguate it (as written, the
"cannot navigate" might be hard to distinguish from the URL itself):

    std::string message = "Cannot navigate to URL: " + url.spec();

[zino, 2015/07/28 01:27:22]

Done.

+  if (url.is_empty())
+    message = "Something went wrong while trying to navigate client.";
+  else
+    message = url.spec() + " cannot navigate.";
+  scoped_ptr<blink::WebServiceWorkerError> error(
+      new blink::WebServiceWorkerError(
+          blink::WebServiceWorkerError::ErrorTypeUnknown,
+          blink::WebString::fromUTF8(message)));
+  callbacks->onError(error.release());
+  context_->client_callbacks.Remove(request_id);
+}
+
 void ServiceWorkerContextClient::OnDidSkipWaiting(int request_id) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnDidSkipWaiting");
   blink::WebServiceWorkerSkipWaitingCallbacks* callbacks =
       context_->skip_waiting_callbacks.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   callbacks->onSuccess();
@@ skipping 36 matching lines @@
 }
 
 base::WeakPtr<ServiceWorkerContextClient>
 ServiceWorkerContextClient::GetWeakPtr() {
   DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(context_);
   return context_->weak_factory.GetWeakPtr();
 }
 
 }  // namespace content