| 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 8b4c670242e745d60b4bfac9dab279a4454052c3..bd0199c99e2efc3cca6547532c8ca6616a852d8f 100644
|
| --- a/content/browser/loader/navigation_url_loader_impl.cc
|
| +++ b/content/browser/loader/navigation_url_loader_impl.cc
|
| @@ -8,20 +8,21 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| #include "base/trace_event/trace_event.h"
|
| #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/navigation_data.h"
|
| #include "content/public/browser/stream_handle.h"
|
|
|
| namespace content {
|
|
|
| NavigationURLLoaderImpl::NavigationURLLoaderImpl(
|
| BrowserContext* browser_context,
|
| std::unique_ptr<NavigationRequestInfo> request_info,
|
| ServiceWorkerNavigationHandle* service_worker_handle,
|
| NavigationURLLoaderDelegate* delegate)
|
| : delegate_(delegate), weak_factory_(this) {
|
| @@ -74,24 +75,26 @@ void NavigationURLLoaderImpl::ProceedWithResponse() {
|
| void NavigationURLLoaderImpl::NotifyRequestRedirected(
|
| const net::RedirectInfo& redirect_info,
|
| const scoped_refptr<ResourceResponse>& response) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
| delegate_->OnRequestRedirected(redirect_info, response);
|
| }
|
|
|
| void NavigationURLLoaderImpl::NotifyResponseStarted(
|
| const scoped_refptr<ResourceResponse>& response,
|
| - std::unique_ptr<StreamHandle> body) {
|
| + std::unique_ptr<StreamHandle> body,
|
| + std::unique_ptr<NavigationData> navigation_data) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
| - delegate_->OnResponseStarted(response, std::move(body));
|
| + delegate_->OnResponseStarted(response, std::move(body),
|
| + std::move(navigation_data));
|
| }
|
|
|
| void NavigationURLLoaderImpl::NotifyRequestFailed(bool in_cache,
|
| int net_error) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
| delegate_->OnRequestFailed(in_cache, net_error);
|
| }
|
|
|
| void NavigationURLLoaderImpl::NotifyRequestStarted(base::TimeTicks timestamp) {
|
|
|