content/browser/frame_host/navigation_request.cc - Issue 1294243004: PlzNavigate: Make ServiceWorker work with PlzNavigate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/navigation_request.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, 4 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

« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | content/browser/loader/navigation_url_loader_impl_core.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_request.cc

diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc

index a99074f2ce3aeb56440b44cc0e9530f0f0c1db39..8a381566d0d3199c08f47d82cf1f09fc89e0dca3 100644

--- a/content/browser/frame_host/navigation_request.cc

+++ b/content/browser/frame_host/navigation_request.cc

@@ -11,6 +11,7 @@

#include "content/browser/frame_host/navigation_request_info.h"

#include "content/browser/frame_host/navigator.h"

#include "content/browser/loader/navigation_url_loader.h"

+#include "content/browser/service_worker/service_worker_provider_host.h"

#include "content/browser/site_instance_impl.h"

#include "content/common/resource_request_body.h"

#include "content/public/browser/navigation_controller.h"

@@ -85,10 +86,15 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(

scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(

frame_tree_node,

- entry.ConstructCommonNavigationParams(dest_url, dest_referrer,

- frame_entry, navigation_type),

- BeginNavigationParams(method, headers.ToString(),

- LoadFlagFromNavigationType(navigation_type), false),

+ entry.ConstructCommonNavigationParams(

+ dest_url, dest_referrer, frame_entry, navigation_type,

+ ServiceWorkerProviderHost::GetNextBrowserProviderID()),

+ BeginNavigationParams(method,

+ headers.ToString(),

+ LoadFlagFromNavigationType(navigation_type),

+ false, // has_user_gestures

+ false, // skip_service_worker

+ REQUEST_CONTEXT_TYPE_HYPERLINK),

nasko 2015/08/31 23:58:17 Is hyperlink the most appropriate here? Browser in

Fabrice (no longer in Chrome) 2015/09/07 12:09:48 I had it set to LOCATION but clamy@ insisted it sh

entry.ConstructRequestNavigationParams(

frame_entry, navigation_start, is_same_document_history_load,

frame_tree_node->has_committed_real_load(),