Omnibox - Make Omnibox Extensions Ignore Stop() Calls Due to User Idleness

components/omnibox/search_provider.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 "components/omnibox/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/base64.h"
@@ skipping 185 matching lines @@
   TemplateURLService* model = providers_.template_url_service();
   DCHECK(model);
   model->Load();
 
   matches_.clear();
   field_trial_triggered_ = false;
 
   // Can't return search/suggest results for bogus input.
   if (called_due_to_focus ||
       input.type() == metrics::OmniboxInputType::INVALID) {
-    Stop(true);
+    Stop(true, false);
     return;
   }
 
   keyword_input_ = input;
   const TemplateURL* keyword_provider =
       KeywordProvider::GetSubstitutingTemplateURLForInput(model,
                                                           &keyword_input_);
   if (keyword_provider == NULL)
     keyword_input_.Clear();
   else if (keyword_input_.text().empty())
     keyword_provider = NULL;
 
   const TemplateURL* default_provider = model->GetDefaultSearchProvider();
   if (default_provider &&
       !default_provider->SupportsReplacement(model->search_terms_data()))
     default_provider = NULL;
 
   if (keyword_provider == default_provider)
     default_provider = NULL;  // No use in querying the same provider twice.
 
   if (!default_provider && !keyword_provider) {
     // No valid providers.
-    Stop(true);
+    Stop(true, false);
     return;
   }
 
   // If we're still running an old query but have since changed the query text
   // or the providers, abort the query.
   base::string16 default_provider_keyword(default_provider ?
       default_provider->keyword() : base::string16());
   base::string16 keyword_provider_keyword(keyword_provider ?
       keyword_provider->keyword() : base::string16());
   if (!minimal_changes ||
       !providers_.equal(default_provider_keyword, keyword_provider_keyword)) {
     // Cancel any in-flight suggest requests.
     if (!done_)
-      Stop(false);
+      Stop(false, false);
   }
 
   providers_.set(default_provider_keyword, keyword_provider_keyword);
 
   if (input.text().empty()) {
     // User typed "?" alone.  Give them a placeholder result indicating what
     // this syntax does.
     if (default_provider) {
       AutocompleteMatch match;
       match.provider = this;
       match.contents.assign(l10n_util::GetStringUTF16(IDS_EMPTY_KEYWORD_VALUE));
       match.contents_class.push_back(
           ACMatchClassification(0, ACMatchClassification::NONE));
       match.keyword = providers_.default_provider();
       match.allowed_to_be_default_match = true;
       matches_.push_back(match);
     }
-    Stop(true);
+    Stop(true, false);
     return;
   }
 
   input_ = input;
 
   DoHistoryQuery(minimal_changes);
   // Answers needs scored history results before any suggest query has been
   // started, since the query for answer-bearing results needs additional
   // prefetch information based on the highest-scored local history result.
   if (OmniboxFieldTrial::EnableAnswersInSuggest()) {
     ScoreHistoryResults(raw_default_history_results_,
                         false,
                         &transformed_default_history_results_);
     ScoreHistoryResults(raw_keyword_history_results_,
                         true,
                         &transformed_keyword_history_results_);
     prefetch_data_ = FindAnswersPrefetchData();
 
     // Raw results are not needed any more.
     raw_default_history_results_.clear();
     raw_keyword_history_results_.clear();
   }
 
   StartOrStopSuggestQuery(minimal_changes);
   UpdateMatches();
 }
 
-void SearchProvider::Stop(bool clear_cached_results) {
+void SearchProvider::Stop(bool clear_cached_results,
+                          bool user_inactivity_timer) {
   StopSuggest();
   done_ = true;
 
   if (clear_cached_results)
     ClearAllResults();
 }
 
 const TemplateURL* SearchProvider::GetTemplateURL(bool is_keyword) const {
   return is_keyword ? providers_.GetKeywordProviderURL()
                     : providers_.GetDefaultProviderURL();
@@ skipping 1149 matching lines @@
   for (MatchMap::const_iterator i(map.begin()); i != map.end(); ++i)
     matches.push_back(i->second);
   std::sort(matches.begin(), matches.end(), &AutocompleteMatch::MoreRelevant);
 
   // If there is a top scoring entry, find the corresponding answer.
   if (!matches.empty())
     return answers_cache_.GetTopAnswerEntry(matches[0].contents);
 
   return AnswersQueryData();
 }