InstantExtended: Hide blank query page off NTP.

chrome/browser/instant/instant_controller.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 207 matching lines @@
   //  5  yes   no    blank    } Impossible. DCHECK()ed above.
   //  6  yes   no  non-blank  }
   //
   //  7  yes  yes    blank    User typed a "?" into the omnibox.
   //
   //  8  yes  yes  non-blank  User typed text into the omnibox.
   //
   //  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;
       }
       if (!user_input_in_progress && full_text.empty())
         return false;
     }
   } else if (!omnibox_popup_is_open || full_text.empty()) {
     // Update() can be called if the user clicks the preview while composing
     // text with an IME. If so, we should commit on mouse up, so don't Hide().
     if (!GetPreviewContents() || !loader_->IsPointerDownFromActivate())
@@ skipping 657 matching lines @@
   }
 
   std::map<std::string, int>::const_iterator iter =
       blacklisted_urls_.find(*instant_url);
   if (iter != blacklisted_urls_.end() &&
       iter->second > kMaxInstantSupportFailures)
     return false;
 
   return true;
 }