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

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 1257553002: [Proof-of-concept] PlzNavigate and Service Worker Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass navigation_provider_id Created 5 years, 5 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/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 5e54fdf04c281aa736aa58cb2fcaea1b32fb296a..d6647fdba9cc1c5af438e6bd9413797468b7b5b2 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -676,7 +676,8 @@ void NavigatorImpl::OnBeginNavigation(
// PlzNavigate
void NavigatorImpl::CommitNavigation(FrameTreeNode* frame_tree_node,
ResourceResponse* response,
- scoped_ptr<StreamHandle> body) {
+ scoped_ptr<StreamHandle> body,
+ int navigation_provider_id) {
CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableBrowserSideNavigation));
@@ -714,10 +715,9 @@ void NavigatorImpl::CommitNavigation(FrameTreeNode* frame_tree_node,
CheckWebUIRendererDoesNotDisplayNormalURL(
render_frame_host, navigation_request->common_params().url);
- render_frame_host->CommitNavigation(response, body.Pass(),
- navigation_request->common_params(),
- navigation_request->request_params());
-
+ render_frame_host->CommitNavigation(
+ response, body.Pass(), navigation_request->common_params(),
+ navigation_request->request_params(), navigation_provider_id);
}
// PlzNavigate

Powered by Google App Engine
This is Rietveld 408576698