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

Unified Diff: chrome/browser/ui/browser_instant_controller.cc

Issue 69013004: Renamed CanPruneAllButVisible and PruneAllButVisible in the Navigation Controller to CanPruneAllBut… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed some unit tests Created 7 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_instant_controller.cc
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index c81a7630d6814f5ae0ca150a3bc67349fbd18ad5..71a474a50447deab975e9207832460abf79ebba9 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -80,7 +80,7 @@ bool BrowserInstantController::MaybeSwapInInstantNTPContents(
// source contents.
// TODO(sreeram): Always using the local URL is wrong in the case of the
// first tab in a window where we might want to use the remote URL. Fix.
- if (!instant_ntp->GetController().CanPruneAllButVisible()) {
+ if (!instant_ntp->GetController().CanPruneAllButLastCommitted()) {
source_contents->GetController().LoadURL(chrome::GetLocalInstantURL(
profile()), content::Referrer(), content::PAGE_TRANSITION_GENERATED,
std::string());
@@ -94,10 +94,10 @@ bool BrowserInstantController::MaybeSwapInInstantNTPContents(
}
} else {
// If the Instant NTP hasn't yet committed an entry, we can't call
- // PruneAllButVisible. In that case, there shouldn't be any entries to
- // prune anyway.
- if (instant_ntp->GetController().CanPruneAllButVisible())
- instant_ntp->GetController().PruneAllButVisible();
+ // PruneAllButLastCommitted. In that case, there shouldn't be any entries
+ // to prune anyway.
+ if (instant_ntp->GetController().CanPruneAllButLastCommitted())
+ instant_ntp->GetController().PruneAllButLastCommitted();
else
CHECK(!instant_ntp->GetController().GetLastCommittedEntry());
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698