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

components/omnibox/keyword_provider.cc

 // Copyright 2014 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/keyword_provider.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/string16.h"
@@ skipping 299 matching lines @@
     if (matches.size() > kMaxMatches)
       matches.erase(matches.begin() + kMaxMatches, matches.end());
     for (TemplateURLService::TemplateURLVector::const_iterator i(
          matches.begin()); i != matches.end(); ++i) {
       matches_.push_back(CreateAutocompleteMatch(
           *i, input, keyword.length(), remaining_input, false, -1));
     }
   }
 }
 
-void KeywordProvider::Stop(bool clear_cached_results) {
+void KeywordProvider::Stop(bool clear_cached_results,
+                           bool user_inactivity_timer) {
   done_ = true;
-  if (extensions_delegate_)
+  // Only end an extensions request if the user did something explicitly

[Peter Kasting, 2015/03/05 23:27:28]

Nit: extension's; explicitly to -> to explicitly

[Mark P, 2015/03/06 21:24:34]

Did both.

+  // to cancel it; the inactivity timer does not count.

[Peter Kasting, 2015/03/05 23:27:28]

Nit: does not count -> shouldn't terminate long-running extension operations,
since the user likely explicity requested them

(at least, I think that's a good rationale)

[Mark P, 2015/03/06 21:24:34]

Done (with minor edits).

+  if (extensions_delegate_ && !user_inactivity_timer)
     extensions_delegate_->MaybeEndExtensionKeywordMode();
 }
 
 KeywordProvider::~KeywordProvider() {}
 
 // static
 bool KeywordProvider::ExtractKeywordFromInput(const AutocompleteInput& input,
                                               base::string16* keyword,
                                               base::string16* remaining_input) {
   if ((input.type() == metrics::OmniboxInputType::INVALID) ||
@@ skipping 133 matching lines @@
         ACMatchClassification::NONE, &match->contents_class);
   }
 }
 
 TemplateURLService* KeywordProvider::GetTemplateURLService() const {
   // Make sure the model is loaded. This is cheap and quickly bails out if
   // the model is already loaded.
   model_->Load();
   return model_;
 }