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

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

Issue 11308284: InstantExtended: Hide blank query page off NTP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | no next file » | 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 f3146a5d324ce0429e460109f88df97bf6c3657a..62cc5a69488aed17099b40e9961cdb47f94e15c0 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -225,12 +225,14 @@ bool InstantController::Update(const AutocompleteMatch& match,
// In non-extended mode, #1 to #7 call Hide(). #8 calls loader_->Update().
//
// In extended mode, #2 and #4 call Hide(). #1 doesn't Hide() as the preview
- // may be showing custom NTP content, but doesn't Update() either. #3 and #7
+ // may be showing custom NTP content, but doesn't Update() either. #3 calls
+ // Hide() unless on the NTP _and_ sends a blank query; otherwise #3 and #7
// don't Hide(), but send a blank query to Update(). #8 calls Update().
if (extended_enabled_) {
if (!omnibox_popup_is_open) {
- if (!full_text.empty()) {
+ if (!full_text.empty() ||
+ (user_input_in_progress && !search_mode_.is_origin_ntp())) {
Hide(true);
return false;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698