content/browser/frame_host/render_frame_host_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/render_frame_host_impl.cc

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

Patch Set: Glorious Post-Blink Merge 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/navigator_impl.cc ('k') | content/browser/loader/navigation_url_loader_impl.cc » ('j') | content/browser/loader/navigation_url_loader_impl_core.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_impl.cc

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

index dbd10ed7233324d1ee31dcf7f53c8cd2dd7a06e5..6515abe996dcd1f9a0e7f0d91b107352feb107fd 100644

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

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

@@ -47,6 +47,7 @@

#include "content/common/inter_process_time_ticks_converter.h"

#include "content/common/navigation_params.h"

#include "content/common/render_frame_setup.mojom.h"

+#include "content/common/service_worker/service_worker_types.h"

#include "content/common/site_isolation_policy.h"

#include "content/common/swapped_out_messages.h"

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

@@ -1728,7 +1729,8 @@ void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) {

CommonNavigationParams common_params(

data_url, Referrer(), ui::PAGE_TRANSITION_LINK,

FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(),

- FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL());

+ FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(),

+ kInvalidServiceWorkerProviderId);

if (base::CommandLine::ForCurrentProcess()->HasSwitch(

switches::kEnableBrowserSideNavigation)) {

CommitNavigation(nullptr, nullptr, common_params,