diff options
| author | jww@chromium.org <jww@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 01:11:01 +0000 |
|---|---|---|
| committer | jww@chromium.org <jww@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 01:11:01 +0000 |
| commit | 7936898a17ce7f7a99de184aca2ef7ec2badfeab (patch) | |
| tree | f9b5199bc69ef62dfde2d25844465d4a528b8eb2 /content/browser/frame_host/navigation_controller_impl.cc | |
| parent | b350d2995cbaeeca5c7d88b1f8e6c5495aef573c (diff) | |
| download | chromium_src-7936898a17ce7f7a99de184aca2ef7ec2badfeab.zip chromium_src-7936898a17ce7f7a99de184aca2ef7ec2badfeab.tar.gz chromium_src-7936898a17ce7f7a99de184aca2ef7ec2badfeab.tar.bz2 | |
Renamed CanPruneAllButVisible and PruneAllButVisible in the Navigation Controller to CanPruneAllButLastCommitted and PruneAllButLastCommitted, respectively.
Review URL: https://codereview.chromium.org/69013004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/frame_host/navigation_controller_impl.cc')
| -rw-r--r-- | content/browser/frame_host/navigation_controller_impl.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc index fb82791..814d56b 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -1229,7 +1229,7 @@ void NavigationControllerImpl::CopyStateFrom( void NavigationControllerImpl::CopyStateFromAndPrune( NavigationController* temp) { // It is up to callers to check the invariants before calling this. - CHECK(CanPruneAllButVisible()); + CHECK(CanPruneAllButLastCommitted()); NavigationControllerImpl* source = static_cast<NavigationControllerImpl*>(temp); @@ -1246,7 +1246,7 @@ void NavigationControllerImpl::CopyStateFromAndPrune( delegate_->GetMaxPageIDForSiteInstance(site_instance.get()); // Remove all the entries leaving the active entry. - PruneAllButVisibleInternal(); + PruneAllButLastCommittedInternal(); // We now have one entry, possibly with a new pending entry. Ensure that // adding the entries from source won't put us over the limit. @@ -1283,7 +1283,7 @@ void NavigationControllerImpl::CopyStateFromAndPrune( } } -bool NavigationControllerImpl::CanPruneAllButVisible() { +bool NavigationControllerImpl::CanPruneAllButLastCommitted() { // If there is no last committed entry, we cannot prune. Even if there is a // pending entry, it may not commit, leaving this WebContents blank, despite // possibly giving it new entries via CopyStateFromAndPrune. @@ -1304,8 +1304,8 @@ bool NavigationControllerImpl::CanPruneAllButVisible() { return true; } -void NavigationControllerImpl::PruneAllButVisible() { - PruneAllButVisibleInternal(); +void NavigationControllerImpl::PruneAllButLastCommitted() { + PruneAllButLastCommittedInternal(); // We should still have a last committed entry. DCHECK_NE(-1, last_committed_entry_index_); @@ -1321,9 +1321,9 @@ void NavigationControllerImpl::PruneAllButVisible() { entry->site_instance(), 0, entry->GetPageID()); } -void NavigationControllerImpl::PruneAllButVisibleInternal() { +void NavigationControllerImpl::PruneAllButLastCommittedInternal() { // It is up to callers to check the invariants before calling this. - CHECK(CanPruneAllButVisible()); + CHECK(CanPruneAllButLastCommitted()); // Erase all entries but the last committed entry. There may still be a // new pending entry after this. |