diff options
Diffstat (limited to 'chromium/content/public/browser/navigation_controller.h')
| -rw-r--r-- | chromium/content/public/browser/navigation_controller.h | 60 |
1 files changed, 16 insertions, 44 deletions
diff --git a/chromium/content/public/browser/navigation_controller.h b/chromium/content/public/browser/navigation_controller.h index 754d13e9688..e9c849418a8 100644 --- a/chromium/content/public/browser/navigation_controller.h +++ b/chromium/content/public/browser/navigation_controller.h @@ -294,24 +294,18 @@ class NavigationController { // has not been responded to, the NavigationEntry is pending. Once data is // received for that entry, that NavigationEntry is committed. - // A transient entry is an entry that, when the user navigates away, is - // removed and discarded rather than being added to the back-forward list. - // Transient entries are useful for interstitial pages and the like. - // Active entry -------------------------------------------------------------- // THIS IS DEPRECATED. DO NOT USE. Use GetVisibleEntry instead. // See http://crbug.com/273710. // - // Returns the active entry, which is the transient entry if any, the pending - // entry if a navigation is in progress or the last committed entry otherwise. - // NOTE: This can be nullptr!! + // Returns the active entry, which is the pending entry if a navigation is in + // progress or the last committed entry otherwise. NOTE: This can be nullptr!! virtual NavigationEntry* GetActiveEntry() = 0; // Returns the entry that should be displayed to the user in the address bar. - // This is the transient entry if any, the pending entry if a navigation is - // in progress *and* is safe to display to the user (see below), or the last - // committed entry otherwise. + // This is the pending entry if a navigation is in progress *and* is safe to + // display to the user (see below), or the last committed entry otherwise. // NOTE: This can be nullptr if no entry has committed! // // A pending entry is safe to display if it started in the browser process or @@ -329,8 +323,7 @@ class NavigationController { virtual NavigationEntry* GetLastCommittedEntry() = 0; // Returns the index of the last committed entry. It will be -1 if there are - // no entries, or if there is a transient entry before the first entry - // commits. + // no entries. virtual int GetLastCommittedEntryIndex() = 0; // Returns true if the source for the current entry can be viewed. @@ -339,8 +332,7 @@ class NavigationController { // Navigation list ----------------------------------------------------------- // Returns the number of entries in the NavigationController, excluding - // the pending entry if there is one, but including the transient entry if - // any. + // the pending entry if there is one. virtual int GetEntryCount() = 0; virtual NavigationEntry* GetEntryAtIndex(int index) = 0; @@ -351,7 +343,7 @@ class NavigationController { // Pending entry ------------------------------------------------------------- - // Discards the pending and transient entries if any. + // Discards the pending entry if any. virtual void DiscardNonCommittedEntries() = 0; // Returns the pending entry corresponding to the navigation that is @@ -362,22 +354,6 @@ class NavigationController { // corresponds to a new navigation (created via LoadURL). virtual int GetPendingEntryIndex() = 0; - // Transient entry ----------------------------------------------------------- - - // Returns the transient entry if any. This is an entry which is removed and - // discarded if any navigation occurs. Note that the returned entry is owned - // by the navigation controller and may be deleted at any time. - virtual NavigationEntry* GetTransientEntry() = 0; - - // Adds an entry that is returned by GetActiveEntry(). The entry is - // transient: any navigation causes it to be removed and discarded. The - // NavigationController becomes the owner of |entry| and deletes it when - // it discards it. This is useful with interstitial pages that need to be - // represented as an entry, but should go away when the user navigates away - // from them. - // Note that adding a transient entry does not change the active contents. - virtual void SetTransientEntry(std::unique_ptr<NavigationEntry> entry) = 0; - // New navigations ----------------------------------------------------------- // Loads the specified URL, specifying extra http headers to add to the @@ -428,8 +404,7 @@ class NavigationController { // |check_for_repost| is true and the current entry has POST data the user is // prompted to see if they really want to reload the page. In nearly all // cases pass in true in production code, but would do false for testing, or - // in cases where no user interface is available for prompting. If a - // transient entry is showing, initiates a new navigation to its URL. + // in cases where no user interface is available for prompting. // NOTE: |reload_type| should never be NONE. virtual void Reload(ReloadType reload_type, bool check_for_repost) = 0; @@ -437,11 +412,11 @@ class NavigationController { // Removes the entry at the specified |index|. If the index is the last // committed index or the pending entry, this does nothing and returns false. - // Otherwise this call discards any transient or pending entries. + // Otherwise this call discards any pending entry. virtual bool RemoveEntryAtIndex(int index) = 0; - // Discards any transient or pending entries, then discards all entries after - // the current entry index. + // Discards any pending entry, then discards all entries after the current + // entry index. virtual void PruneForwardEntries() = 0; // Random -------------------------------------------------------------------- @@ -500,23 +475,20 @@ class NavigationController { // If there is a pending entry after *G* in |this|, it is also preserved. // If |replace_entry| is true, the current entry in |source| is replaced. So // the result above would be A B *G*. - // This ignores any pending or transient entries in |source|. Callers must - // ensure that |CanPruneAllButLastCommitted| returns true before calling this, - // or it will crash. + // This ignores any pending entry in |source|. Callers must ensure that + // |CanPruneAllButLastCommitted| returns true before calling this, or it will + // crash. virtual void CopyStateFromAndPrune(NavigationController* source, bool replace_entry) = 0; // Returns whether it is safe to call PruneAllButLastCommitted or - // CopyStateFromAndPrune. There must be a last committed entry, no transient - // entry, and if there is a pending entry, it must be new and not an existing - // entry. + // CopyStateFromAndPrune. There must be a last committed entry, and if there + // is a pending entry, it must be new and not an existing entry. // // If there were no last committed entry, the pending entry might not commit, // leaving us with a blank page. This is unsafe when used with // |CopyStateFromAndPrune|, which would show an existing entry above the blank // page. - // If there were a transient entry, we would not want to prune the other - // entries, which the transient entry could be referring to. // If there were an existing pending entry, we could not prune the last // committed entry, in case it did not commit. That would leave us with no // sensible place to put the pending entry when it did commit, after all other |