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

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

Issue 1018383002: Make NavigationParams clearer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + addressed comment Created 5 years, 9 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.h ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bb4de6d38f6d21e33edf96f06a395f568cd796ac..6d58505185807b14b61349d410857ce217e11ebf 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -317,8 +317,10 @@ bool NavigatorImpl::NavigateToEntry(
dest_render_frame_host->Navigate(
entry.ConstructCommonNavigationParams(navigation_type),
entry.ConstructStartNavigationParams(),
- entry.ConstructCommitNavigationParams(navigation_start),
- entry.ConstructHistoryNavigationParams(controller_));
+ entry.ConstructRequestNavigationParams(
+ navigation_start, controller_->GetIndexOfEntry(&entry),
+ controller_->GetLastCommittedEntryIndex(),
+ controller_->GetEntryCount()));
} else {
// No need to navigate again. Just resume the deferred request.
dest_render_frame_host->GetProcess()->ResumeDeferredNavigation(
@@ -700,8 +702,7 @@ void NavigatorImpl::CommitNavigation(FrameTreeNode* frame_tree_node,
render_frame_host->CommitNavigation(response, body.Pass(),
navigation_request->common_params(),
- navigation_request->commit_params(),
- navigation_request->history_params());
+ navigation_request->request_params());
}
// PlzNavigate
« no previous file with comments | « content/browser/frame_host/navigator_impl.h ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698