| Index: content/browser/service_worker/service_worker_provider_host.cc
|
| diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc
|
| index 5e4bea83ee1be62979039befcb27b56ef25834e4..c5f9b16ef4a6d94b5beac935992e2af8a2e0875f 100644
|
| --- a/content/browser/service_worker/service_worker_provider_host.cc
|
| +++ b/content/browser/service_worker/service_worker_provider_host.cc
|
| @@ -5,7 +5,6 @@
|
| #include "content/browser/service_worker/service_worker_provider_host.h"
|
|
|
| #include "base/stl_util.h"
|
| -#include "content/browser/frame_host/render_frame_host_impl.h"
|
| #include "content/browser/message_port_message_filter.h"
|
| #include "content/browser/service_worker/service_worker_context_core.h"
|
| #include "content/browser/service_worker/service_worker_context_request_handler.h"
|
| @@ -42,31 +41,6 @@
|
|
|
| BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
|
| base::Bind(callback, result));
|
| -}
|
| -
|
| -void GetClientInfoOnUIThread(
|
| - int render_process_id,
|
| - int render_frame_id,
|
| - const ServiceWorkerProviderHost::GetClientInfoCallback& callback) {
|
| - RenderFrameHostImpl* render_frame_host = static_cast<RenderFrameHostImpl*>(
|
| - RenderFrameHost::FromID(render_process_id, render_frame_id));
|
| - if (!render_frame_host) {
|
| - BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
|
| - base::Bind(callback, 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.
|
| - ServiceWorkerClientInfo client_info(
|
| - 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);
|
| -
|
| - BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
|
| - base::Bind(callback, client_info));
|
| }
|
|
|
| } // anonymous namespace
|
| @@ -296,12 +270,10 @@
|
| }
|
|
|
| void ServiceWorkerProviderHost::GetClientInfo(
|
| - const GetClientInfoCallback& callback) {
|
| - BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| - base::Bind(&GetClientInfoOnUIThread,
|
| - render_process_id_,
|
| - render_frame_id_,
|
| - callback));
|
| + int embedded_worker_id,
|
| + int request_id) {
|
| + Send(new ServiceWorkerMsg_GetClientInfo(
|
| + kDocumentMainThreadId, embedded_worker_id, request_id, provider_id()));
|
| }
|
|
|
| void ServiceWorkerProviderHost::AddScopedProcessReferenceToPattern(
|
|
|