| Index: content/public/browser/navigation_controller.h
|
| diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h
|
| index 99ed8ca6b1006e566e4303b122d9f525a31e0c91..70991647f8d0f0cf737d1356f859e02c955715b4 100644
|
| --- a/content/public/browser/navigation_controller.h
|
| +++ b/content/public/browser/navigation_controller.h
|
| @@ -406,11 +406,11 @@ class NavigationController {
|
| // result: A B C *G*
|
| // If there is a pending entry after *G* in |this|, it is also preserved.
|
| // This ignores any pending or transient entries in |source|. Callers must
|
| - // ensure that |CanPruneAllButVisible| returns true before calling this, or it
|
| - // will crash.
|
| + // ensure that |CanPruneAllButLastCommitted| returns true before calling this,
|
| + // or it will crash.
|
| virtual void CopyStateFromAndPrune(NavigationController* source) = 0;
|
|
|
| - // Returns whether it is safe to call PruneAllButVisible or
|
| + // 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.
|
| @@ -426,12 +426,13 @@ class NavigationController {
|
| // sensible place to put the pending entry when it did commit, after all other
|
| // entries are pruned. For example, it could be going back several entries.
|
| // (New pending entries are safe, because they can always commit to the end.)
|
| - virtual bool CanPruneAllButVisible() = 0;
|
| + virtual bool CanPruneAllButLastCommitted() = 0;
|
|
|
| // Removes all the entries except the last committed entry. If there is a new
|
| // pending navigation it is preserved. Callers must ensure
|
| - // |CanPruneAllButVisible| returns true before calling this, or it will crash.
|
| - virtual void PruneAllButVisible() = 0;
|
| + // |CanPruneAllButLastCommitted| returns true before calling this, or it will
|
| + // crash.
|
| + virtual void PruneAllButLastCommitted() = 0;
|
|
|
| // Clears all screenshots associated with navigation entries in this
|
| // controller. Useful to reduce memory consumption in low-memory situations.
|
|
|