Chromium Code Reviews| Index: components/omnibox/keyword_provider.cc |
| diff --git a/components/omnibox/keyword_provider.cc b/components/omnibox/keyword_provider.cc |
| index 25807773a61ab932d7116e6a20c58e8b8426ab8c..dcabaf6231ed9f3dc3dcc3f0ad932a11a44346c3 100644 |
| --- a/components/omnibox/keyword_provider.cc |
| +++ b/components/omnibox/keyword_provider.cc |
| @@ -317,9 +317,12 @@ void KeywordProvider::Start(const AutocompleteInput& input, |
| } |
| } |
| -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-ru
Mark P
2015/03/06 21:24:34
Done (with minor edits).
|
| + if (extensions_delegate_ && !user_inactivity_timer) |
| extensions_delegate_->MaybeEndExtensionKeywordMode(); |
| } |