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

Unified Diff: content/browser/frame_host/navigation_entry_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/browser/frame_host/navigation_entry_impl.h
diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h
index 0528da0db31bda4f4087a3beb3d0f6e105734986..318337a87bbd38d302a36366bb222dc4db516342 100644
--- a/content/browser/frame_host/navigation_entry_impl.h
+++ b/content/browser/frame_host/navigation_entry_impl.h
@@ -18,10 +18,8 @@
#include "content/public/common/ssl_status.h"
namespace content {
-class NavigationControllerImpl;
struct CommitNavigationParams;
struct CommonNavigationParams;
-struct HistoryNavigationParams;
struct StartNavigationParams;
class CONTENT_EXPORT NavigationEntryImpl
@@ -124,6 +122,17 @@ class CONTENT_EXPORT NavigationEntryImpl
// tab) and one that draws them from a different pool (for use in a new tab).
NavigationEntryImpl* Clone() const;
+ // Helper functions to construct NavigationParameters for a navigation to this
+ // NavigationEntry.
+ CommonNavigationParams ConstructCommonNavigationParams(
+ FrameMsg_Navigate_Type::Value navigation_type) const;
+ StartNavigationParams ConstructStartNavigationParams() const;
+ CommitNavigationParams ConstructCommitNavigationParams(
+ base::TimeTicks navigation_start,
+ int pending_offset_to_send,
+ int current_offset_to_send,
+ int current_length_to_send) const;
+
// Once a navigation entry is committed, we should no longer track several
// pieces of non-persisted state, as documented on the members below.
void ResetForCommit();
@@ -262,14 +271,6 @@ class CONTENT_EXPORT NavigationEntryImpl
// Returns the history URL for a data URL to use in Blink.
GURL GetHistoryURLForDataURL() const;
- CommonNavigationParams ConstructCommonNavigationParams(
- FrameMsg_Navigate_Type::Value navigation_type) const;
- CommitNavigationParams ConstructCommitNavigationParams(
- base::TimeTicks navigation_start) const;
- HistoryNavigationParams ConstructHistoryNavigationParams(
- NavigationControllerImpl* controller) const;
- StartNavigationParams ConstructStartNavigationParams() const;
-
#if defined(OS_ANDROID)
base::TimeTicks intent_received_timestamp() const {
return intent_received_timestamp_;

Powered by Google App Engine
This is Rietveld 408576698