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

Unified Diff: content/renderer/render_view_impl.cc

Issue 979443002: PlzNavigate: send history params at commit time to the renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments Created 5 years, 10 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/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 22d4ce6aaa6a54bceab3a4b2bbebe57ca922b437..3eee7b2993efcde98a5084943bdbfd8cf227c9bf 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2245,7 +2245,7 @@ void RenderViewImpl::PopulateDocumentStateFromPending(
if (IsReload(params.common_params.navigation_type))
document_state->set_load_type(DocumentState::RELOAD);
- else if (params.commit_params.page_state.IsValid())
+ else if (params.history_params.page_state.IsValid())
document_state->set_load_type(DocumentState::HISTORY_LOAD);
else
document_state->set_load_type(DocumentState::NORMAL_LOAD);
@@ -2267,9 +2267,9 @@ NavigationState* RenderViewImpl::CreateNavigationStateFromPending() {
// initiated any load resulting from JS execution.
if (!params.common_params.url.SchemeIs(url::kJavaScriptScheme)) {
navigation_state = NavigationState::CreateBrowserInitiated(
- params.page_id,
- params.pending_history_list_offset,
- params.should_clear_history_list,
+ params.history_params.page_id,
+ params.history_params.pending_history_list_offset,
+ params.history_params.should_clear_history_list,
params.common_params.transition);
navigation_state->set_should_replace_current_entry(
params.should_replace_current_entry);
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698