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

Unified Diff: content/renderer/navigation_state_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/renderer/navigation_state_impl.h ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/navigation_state_impl.cc
diff --git a/content/renderer/navigation_state_impl.cc b/content/renderer/navigation_state_impl.cc
index d240eacc59753776f3a17de741db6324b957f1d8..38d1eed8d569f0aa47b28935f442ad3f7d78780b 100644
--- a/content/renderer/navigation_state_impl.cc
+++ b/content/renderer/navigation_state_impl.cc
@@ -12,15 +12,15 @@ NavigationStateImpl::~NavigationStateImpl() {
NavigationStateImpl* NavigationStateImpl::CreateBrowserInitiated(
const CommonNavigationParams& common_params,
const StartNavigationParams& start_params,
- const HistoryNavigationParams& history_params) {
- return new NavigationStateImpl(common_params, start_params, history_params,
+ const RequestNavigationParams& request_params) {
+ return new NavigationStateImpl(common_params, start_params, request_params,
false);
}
NavigationStateImpl* NavigationStateImpl::CreateContentInitiated() {
return new NavigationStateImpl(CommonNavigationParams(),
StartNavigationParams(),
- HistoryNavigationParams(), true);
+ RequestNavigationParams(), true);
}
ui::PageTransition NavigationStateImpl::GetTransitionType() {
@@ -38,14 +38,14 @@ bool NavigationStateImpl::IsContentInitiated() {
NavigationStateImpl::NavigationStateImpl(
const CommonNavigationParams& common_params,
const StartNavigationParams& start_params,
- const HistoryNavigationParams& history_params,
+ const RequestNavigationParams& request_params,
bool is_content_initiated)
: request_committed_(false),
was_within_same_page_(false),
is_content_initiated_(is_content_initiated),
common_params_(common_params),
start_params_(start_params),
- history_params_(history_params) {
+ request_params_(request_params) {
}
} // namespace content
« no previous file with comments | « content/renderer/navigation_state_impl.h ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698