| Index: content/browser/loader/navigation_url_loader_impl_core.cc
|
| diff --git a/content/browser/loader/navigation_url_loader_impl_core.cc b/content/browser/loader/navigation_url_loader_impl_core.cc
|
| index 65a53b76f51f5906b51fd4bb50919df4be8327d3..67674fde71b65ed996143e22ad7071c9fc22b753 100644
|
| --- a/content/browser/loader/navigation_url_loader_impl_core.cc
|
| +++ b/content/browser/loader/navigation_url_loader_impl_core.cc
|
| @@ -15,6 +15,7 @@
|
| #include "content/common/navigation_params.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/navigation_data.h"
|
| +#include "content/public/browser/navigation_ui_data.h"
|
| #include "content/public/browser/ssl_status.h"
|
| #include "content/public/browser/stream_handle.h"
|
| #include "content/public/common/resource_response.h"
|
| @@ -44,7 +45,8 @@ NavigationURLLoaderImplCore::~NavigationURLLoaderImplCore() {
|
| void NavigationURLLoaderImplCore::Start(
|
| ResourceContext* resource_context,
|
| ServiceWorkerContextWrapper* service_worker_context_wrapper,
|
| - std::unique_ptr<NavigationRequestInfo> request_info) {
|
| + std::unique_ptr<NavigationRequestInfo> request_info,
|
| + std::unique_ptr<NavigationUIData> navigation_ui_data) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
| BrowserThread::PostTask(
|
| @@ -52,6 +54,7 @@ void NavigationURLLoaderImplCore::Start(
|
| base::Bind(&NavigationURLLoaderImpl::NotifyRequestStarted, loader_,
|
| base::TimeTicks::Now()));
|
| request_info_ = std::move(request_info);
|
| + navigation_ui_data_ = std::move(navigation_ui_data);
|
| resource_context_ = resource_context;
|
|
|
| // Check if there is a ServiceWorker registered for this navigation if
|
| @@ -66,7 +69,8 @@ void NavigationURLLoaderImplCore::Start(
|
| factory_.GetWeakPtr()));
|
| } else {
|
| ResourceDispatcherHostImpl::Get()->BeginNavigationRequest(
|
| - resource_context_, *request_info_, this);
|
| + resource_context_, *request_info_, std::move(navigation_ui_data_),
|
| + this);
|
| }
|
| }
|
|
|
| @@ -170,7 +174,7 @@ void NavigationURLLoaderImplCore::OnServiceWorkerChecksPerformed(
|
| return;
|
|
|
| ResourceDispatcherHostImpl::Get()->BeginNavigationRequest(
|
| - resource_context_, *request_info_, this);
|
| + resource_context_, *request_info_, std::move(navigation_ui_data_), this);
|
| }
|
|
|
| } // namespace content
|
|
|