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

Unified Diff: chrome/browser/ui/search/instant_controller.cc

Issue 15041004: Replace PruneAllButActive with PruneAllButVisible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change to CHECK. Created 7 years, 7 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: chrome/browser/ui/search/instant_controller.cc
diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc
index e6e9bdd305e8cc1066c573e052653baed6c1c59a..8abdf15bfb8446e17f86564264bed18c0152dd90 100644
--- a/chrome/browser/ui/search/instant_controller.cc
+++ b/chrome/browser/ui/search/instant_controller.cc
@@ -862,7 +862,10 @@ bool InstantController::CommitIfPossible(InstantCommitType type) {
overlay_->Submit(last_omnibox_text_);
}
+ // We expect the WebContents to be in a valid state (i.e., has a last
+ // committed entry, no transient entry, and no existing pending entry).
scoped_ptr<content::WebContents> overlay = overlay_->ReleaseContents();
+ CHECK(overlay->GetController().CanPruneAllButVisible());
// If the overlay page has navigated since the last Update(), we need to add
// the navigation to history ourselves. Else, the page will navigate after
@@ -902,7 +905,7 @@ bool InstantController::CommitIfPossible(InstantCommitType type) {
}
if (type == INSTANT_COMMIT_PRESSED_ALT_ENTER) {
- overlay->GetController().PruneAllButActive();
+ overlay->GetController().PruneAllButVisible();
} else {
content::WebContents* active_tab = browser_->GetActiveWebContents();
AddSessionStorageHistogram(extended_enabled(), active_tab, overlay.get());
« no previous file with comments | « chrome/browser/ui/browser_instant_controller.cc ('k') | chrome/test/data/prerender/prerender_visibility_quick.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698