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

Unified Diff: content/renderer/navigation_state_impl.h

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
Index: content/renderer/navigation_state_impl.h
diff --git a/content/renderer/navigation_state_impl.h b/content/renderer/navigation_state_impl.h
index d6b4e05b8309278a96b633019bc88b1eb560fd04..bc2f4569ecb61737d8f04a07e6a255a1ec7741b7 100644
--- a/content/renderer/navigation_state_impl.h
+++ b/content/renderer/navigation_state_impl.h
@@ -19,7 +19,7 @@ class CONTENT_EXPORT NavigationStateImpl : public NavigationState {
static NavigationStateImpl* CreateBrowserInitiated(
const CommonNavigationParams& common_params,
const StartNavigationParams& start_params,
- const HistoryNavigationParams& history_params);
+ const CommitNavigationParams& commit_params);
static NavigationStateImpl* CreateContentInitiated();
@@ -30,9 +30,7 @@ class CONTENT_EXPORT NavigationStateImpl : public NavigationState {
const CommonNavigationParams& common_params() const { return common_params_; }
const StartNavigationParams& start_params() const { return start_params_; }
- const HistoryNavigationParams& history_params() const {
- return history_params_;
- }
+ const CommitNavigationParams& commit_params() const { return commit_params_; }
bool request_committed() const { return request_committed_; }
void set_request_committed(bool value) { request_committed_ = value; }
void set_was_within_same_page(bool value) { was_within_same_page_ = value; }
@@ -44,7 +42,7 @@ class CONTENT_EXPORT NavigationStateImpl : public NavigationState {
private:
NavigationStateImpl(const CommonNavigationParams& common_params,
const StartNavigationParams& start_params,
- const HistoryNavigationParams& history_params,
+ const CommitNavigationParams& commit_params,
bool is_content_initiated);
bool request_committed_;
@@ -67,7 +65,7 @@ class CONTENT_EXPORT NavigationStateImpl : public NavigationState {
// swaps because FrameLoader::loadWithNavigationAction treats loads before a
// FrameLoader has committedFirstRealDocumentLoad as a replacement. (Added for
// http://crbug.com/178380).
- const HistoryNavigationParams history_params_;
+ const CommitNavigationParams commit_params_;
DISALLOW_COPY_AND_ASSIGN(NavigationStateImpl);
};

Powered by Google App Engine
This is Rietveld 408576698