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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1018383002: Make NavigationParams clearer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« content/common/navigation_params.h ('K') | « content/renderer/render_view_impl.h ('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 568e19c56081c54ee66b4410b94293327d64d734..d27f1718eb840a3281a542bc1215b1719e98db61 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2207,7 +2207,7 @@ void RenderViewImpl::PopulateDocumentStateFromPending(
if (IsReload(pending_navigation_params_->common_params.navigation_type))
document_state->set_load_type(DocumentState::RELOAD);
- else if (pending_navigation_params_->history_params.page_state.IsValid())
+ else if (pending_navigation_params_->commit_params.page_state.IsValid())
document_state->set_load_type(DocumentState::HISTORY_LOAD);
else
document_state->set_load_type(DocumentState::NORMAL_LOAD);
@@ -2230,7 +2230,7 @@ NavigationState* RenderViewImpl::CreateNavigationStateFromPending() {
return NavigationStateImpl::CreateBrowserInitiated(
pending_navigation_params_->common_params,
pending_navigation_params_->start_params,
- pending_navigation_params_->history_params);
+ pending_navigation_params_->commit_params);
}
return NavigationStateImpl::CreateContentInitiated();
}
« content/common/navigation_params.h ('K') | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698