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, 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.h ('k') | content/browser/frame_host/navigation_request.cc » ('j') | content/browser/frame_host/navigation_request.cc » ('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..4af4679e92eb71d8ab4c528a15ca7d5bec84e570 100644

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

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

@@ -441,7 +441,8 @@ CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(

const GURL& dest_url,

const Referrer& dest_referrer,

const FrameNavigationEntry& frame_entry,

- FrameMsg_Navigate_Type::Value navigation_type) const {

+ FrameMsg_Navigate_Type::Value navigation_type,

+ int service_worker_provider_id) const {

FrameMsg_UILoadMetricsReportType::Value report_type =

FrameMsg_UILoadMetricsReportType::NO_REPORT;

base::TimeTicks ui_timestamp = base::TimeTicks();

@@ -454,7 +455,8 @@ CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(

return CommonNavigationParams(

dest_url, dest_referrer, GetTransitionType(), navigation_type,

!IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type,

- GetBaseURLForDataURL(), GetHistoryURLForDataURL());

+ GetBaseURLForDataURL(), GetHistoryURLForDataURL(),

+ service_worker_provider_id);

}

StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams()