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

content/browser/service_worker/service_worker_provider_host.cc

 // Copyright 2013 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/browser/service_worker/service_worker_provider_host.h"
 
 #include "base/stl_util.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
@@ skipping 28 matching lines @@
     return ServiceWorkerClientInfo();
 
   // TODO(mlamouri,michaeln): it is possible to end up collecting information
   // for a frame that is actually being navigated and isn't exactly what we are
   // expecting.
   return ServiceWorkerClientInfo(
       render_frame_host->GetVisibilityState(),
       render_frame_host->IsFocused(),
       render_frame_host->GetLastCommittedURL(),
       render_frame_host->GetParent() ? REQUEST_CONTEXT_FRAME_TYPE_NESTED
-                                     : REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL);
+                                     : REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
+      blink::WebServiceWorkerClientTypeWindow);

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

maybe I'm lost, how do we know this is a window and not a shared worker?

[kinuko, 2015/03/05 02:30:23]

We collect these clients using render_frame_id, which is -1 for worker cases.

[falken, 2015/03/05 14:23:01]

Acknowledged.

 }
 
 ServiceWorkerClientInfo FocusOnUIThread(
     int render_process_id,
     int render_frame_id) {
   RenderFrameHostImpl* render_frame_host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
       WebContents::FromRenderFrameHost(render_frame_host));
 
@@ skipping 450 matching lines @@
   return context_ != NULL;
 }
 
 void ServiceWorkerProviderHost::Send(IPC::Message* message) const {
   DCHECK(dispatcher_host_);
   DCHECK(IsReadyToSendMessages());
   dispatcher_host_->Send(message);
 }
 
 }  // namespace content