content/browser/frame_host/navigation_entry_impl.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_entry_impl.cc

Issue 1294243004: PlzNavigate: Make ServiceWorker work with PlzNavigate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 3 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.h ('k') | content/browser/frame_host/navigation_handle_impl.h » ('j') | content/browser/frame_host/navigation_handle_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_entry_impl.cc

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

index 1adb2be5d700a2f168971c42864488bf3594f81b..729f45aae4a97698c08ef7ec35ab0e3d3077dea6 100644

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

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

@@ -484,7 +484,8 @@ RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams(

bool intended_as_new_entry,

int pending_history_list_offset,

int current_history_list_offset,

- int current_history_list_length) const {

+ int current_history_list_length,

+ int service_worker_provider_id) const {

// Set the redirect chain to the navigation's redirects, unless returning to a

// completed navigation (whose previous redirects don't apply).

std::vector<GURL> redirects;

@@ -509,7 +510,7 @@ RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams(

GetPageID(), GetUniqueID(), is_same_document_history_load,

has_committed_real_load, intended_as_new_entry, pending_offset_to_send,

current_offset_to_send, current_length_to_send,

- should_clear_history_list());

+ should_clear_history_list(), service_worker_provider_id);

}

void NavigationEntryImpl::ResetForCommit() {