Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1422)

Unified Diff: content/browser/loader/navigation_url_loader_impl_core.cc

Issue 1294243004: PlzNavigate: Make ServiceWorker work with PlzNavigate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 7fe69513040d5419a717f6a235658d80e8e77dd8..ac9e2873221458026d245e9a7fdbfdaef4ce7e3d 100644
--- a/content/browser/loader/navigation_url_loader_impl_core.cc
+++ b/content/browser/loader/navigation_url_loader_impl_core.cc
@@ -10,7 +10,9 @@
#include "content/browser/frame_host/navigation_request_info.h"
#include "content/browser/loader/navigation_resource_handler.h"
#include "content/browser/loader/resource_dispatcher_host_impl.h"
+#include "content/browser/service_worker/service_worker_context_wrapper.h"
#include "content/common/navigation_params.h"
+#include "content/common/service_worker/service_worker_types.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/stream_handle.h"
#include "content/public/common/resource_response.h"
@@ -20,9 +22,12 @@
namespace content {
NavigationURLLoaderImplCore::NavigationURLLoaderImplCore(
- const base::WeakPtr<NavigationURLLoaderImpl>& loader)
+ const base::WeakPtr<NavigationURLLoaderImpl>& loader,
+ ServiceWorkerContext* service_worker_context)
: loader_(loader),
- resource_handler_(nullptr) {
+ resource_handler_(nullptr),
+ service_worker_context_(
+ static_cast<ServiceWorkerContextWrapper*>(service_worker_context)) {
// This object is created on the UI thread but otherwise is accessed and
// deleted on the IO thread.
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -46,7 +51,7 @@ void NavigationURLLoaderImplCore::Start(
base::TimeTicks::Now()));
ResourceDispatcherHostImpl::Get()->BeginNavigationRequest(
- resource_context, *request_info, this);
+ resource_context, *request_info, this, service_worker_context_);
}
void NavigationURLLoaderImplCore::FollowRedirect() {
@@ -56,7 +61,6 @@ void NavigationURLLoaderImplCore::FollowRedirect() {
resource_handler_->FollowRedirect();
}
-
void NavigationURLLoaderImplCore::NotifyRequestRedirected(
const net::RedirectInfo& redirect_info,
ResourceResponse* response) {

Powered by Google App Engine
This is Rietveld 408576698