InstantExtended: better handling of switching between tab and overlay.

chrome/browser/ui/search/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/ui/search/instant_controller.h"
 
 #include <iterator>
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 276 matching lines @@
   // the NTP.
   // However, in some tests, browser_ may be null.
   if (browser_)
     InstantServiceFactory::GetForProfile(browser_->profile());
 }
 
 InstantController::~InstantController() {
 }
 
 void InstantController::OnAutocompleteStart() {
-  if (instant_tab_ && instant_tab_->supports_instant()) {
+  if (UseTabForSuggestions() && instant_tab_->supports_instant()) {
     LOG_INSTANT_DEBUG_EVENT(
         this, "OnAutocompleteStart: using InstantTab");
     return;
   }
 
-  use_tab_for_suggestions_ = false;
-
   // Not using |instant_tab_|. Check if overlay is OK to use.
   InstantFallbackReason fallback_reason = ShouldSwitchToLocalOverlay();
   if (fallback_reason != INSTANT_FALLBACK_NONE) {
     ResetOverlay(GetLocalInstantURL());
     RecordFallbackReasonHistogram(fallback_reason);
     LOG_INSTANT_DEBUG_EVENT(
         this, "OnAutocompleteStart: switching to local overlay");
   } else {
     LOG_INSTANT_DEBUG_EVENT(
         this, "OnAutocompleteStart: using existing overlay");
   }
+  use_tab_for_suggestions_ = false;
 }
 
 bool InstantController::Update(const AutocompleteMatch& match,
                                const string16& user_text,
                                const string16& full_text,
                                size_t selection_start,
                                size_t selection_end,
                                bool verbatim,
                                bool user_input_in_progress,
                                bool omnibox_popup_is_open,
@@ skipping 1555 matching lines @@
   result->transition = match.transition;
   result->relevance = match.relevance;
   result->autocomplete_match_index = autocomplete_match_index;
 
   DVLOG(1) << "    " << result->relevance << " "
       << UTF8ToUTF16(AutocompleteMatchType::ToString(result->type)) << " "
       << result->provider << " " << result->destination_url << " '"
       << result->description << "' '" << result->search_query << "' "
       << result->transition <<  " " << result->autocomplete_match_index;
 }