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

Unified Diff: content/browser/loader/navigation_url_loader_impl.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.cc
diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
index 7cbd9112d6da438e78457b29d62bd51a7fc76658..b06f09308e7fb720bc16199c92e017ad3df24bae 100644
--- a/content/browser/loader/navigation_url_loader_impl.cc
+++ b/content/browser/loader/navigation_url_loader_impl.cc
@@ -11,6 +11,7 @@
#include "content/browser/loader/navigation_url_loader_impl_core.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
#include "content/public/browser/stream_handle.h"
namespace content {
@@ -23,7 +24,13 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
weak_factory_(this) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- core_ = new NavigationURLLoaderImplCore(weak_factory_.GetWeakPtr());
+ // TODO(clamy): Picking the partition based on the URL is incorrect.
+ // See crbug.com/513539
+ StoragePartition* partition = BrowserContext::GetStoragePartitionForSite(
+ browser_context, request_info->common_params.url);
+ DCHECK(partition);
+ core_ = new NavigationURLLoaderImplCore(weak_factory_.GetWeakPtr(),
+ partition->GetServiceWorkerContext());
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&NavigationURLLoaderImplCore::Start, base::Unretained(core_),

Powered by Google App Engine
This is Rietveld 408576698