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

Unified Diff: chrome/browser/instant/instant_controller.cc

Issue 10959049: Change visibility semantics for Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable a test Created 8 years, 3 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
« no previous file with comments | « chrome/browser/instant/instant_browsertest.cc ('k') | chrome/browser/ui/browser_instant_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 2f2f50b3921c31cfb78a0aa8e9df5c795beda794..9ce64f47587ab8038c720ec95c2487f2f4b17662 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -386,8 +386,8 @@ TabContents* InstantController::ReleasePreviewContents(InstantCommitType type) {
// still be on the stack. So, schedule a destruction for later.
MessageLoop::current()->DeleteSoon(FROM_HERE, loader_.release());
- // This call is here to hide the preview and reset view state. It won't
- // actually delete |loader_| because it was just released to DeleteSoon().
+ // This call is here to reset view state. It won't actually delete |loader_|
+ // because it was just released to DeleteSoon().
DeleteLoader();
return preview;
@@ -658,15 +658,17 @@ void InstantController::MaybeOnStaleLoader() {
}
void InstantController::DeleteLoader() {
+ last_active_tab_ = NULL;
last_full_text_.clear();
last_user_text_.clear();
last_verbatim_ = false;
last_suggestion_ = InstantSuggestion();
last_transition_type_ = content::PAGE_TRANSITION_LINK;
last_match_was_search_ = false;
+ is_showing_ = false;
+ loader_processed_last_update_ = false;
last_omnibox_bounds_ = gfx::Rect();
url_for_history_ = GURL();
- Hide();
if (GetPreviewContents())
AddPreviewUsageForHistogram(mode_, PREVIEW_DELETED);
loader_.reset();
« no previous file with comments | « chrome/browser/instant/instant_browsertest.cc ('k') | chrome/browser/ui/browser_instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698