Index: content/browser/loader/navigation_url_loader_impl.cc |
diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc |
index 7cbd9112d6da438e78457b29d62bd51a7fc76658..2cae9a6237240334d3d026ea6b1d5f5075744b9b 100644 |
--- a/content/browser/loader/navigation_url_loader_impl.cc |
+++ b/content/browser/loader/navigation_url_loader_impl.cc |
@@ -9,6 +9,7 @@ |
#include "content/browser/frame_host/navigation_request_info.h" |
#include "content/browser/loader/navigation_url_loader_delegate.h" |
#include "content/browser/loader/navigation_url_loader_impl_core.h" |
+#include "content/browser/service_worker/service_worker_navigation_handle.h" |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/stream_handle.h" |
@@ -18,17 +19,19 @@ namespace content { |
NavigationURLLoaderImpl::NavigationURLLoaderImpl( |
BrowserContext* browser_context, |
scoped_ptr<NavigationRequestInfo> request_info, |
+ ServiceWorkerNavigationHandle* service_worker_handle, |
NavigationURLLoaderDelegate* delegate) |
- : delegate_(delegate), |
- weak_factory_(this) { |
+ : delegate_(delegate), weak_factory_(this) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
core_ = new NavigationURLLoaderImplCore(weak_factory_.GetWeakPtr()); |
+ ServiceWorkerNavigationHandleCore* service_worker_handle_core = |
+ service_worker_handle ? service_worker_handle->core() : nullptr; |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
base::Bind(&NavigationURLLoaderImplCore::Start, base::Unretained(core_), |
browser_context->GetResourceContext(), |
- base::Passed(&request_info))); |
+ service_worker_handle_core, base::Passed(&request_info))); |
} |
NavigationURLLoaderImpl::~NavigationURLLoaderImpl() { |