Add support for providers called when the omnibox is focused.

chrome/browser/autocomplete/autocomplete_controller.cc

 // Copyright (c) 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/autocomplete/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/format_macros.h"
@@ skipping 165 matching lines @@
     TemplateURLService* template_url_service,
     AutocompleteControllerDelegate* delegate,
     int provider_types)
     : delegate_(delegate),
       history_url_provider_(NULL),
       keyword_provider_(NULL),
       search_provider_(NULL),
       zero_suggest_provider_(NULL),
       stop_timer_duration_(OmniboxFieldTrial::StopTimerFieldTrialDuration()),
       done_(true),
+      has_providers_for_omnibox_focus_(false),
       in_start_(false),
       template_url_service_(template_url_service) {
   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
   if (provider_types & AutocompleteProvider::TYPE_BOOKMARK)
     providers_.push_back(new BookmarkProvider(profile));
   if (provider_types & AutocompleteProvider::TYPE_BUILTIN)
     providers_.push_back(new BuiltinProvider());
   if (provider_types & AutocompleteProvider::TYPE_HISTORY_QUICK)
     providers_.push_back(new HistoryQuickProvider(profile));
   if (provider_types & AutocompleteProvider::TYPE_HISTORY_URL) {
@@ skipping 19 matching lines @@
     providers_.push_back(search_provider_);
   }
   if (provider_types & AutocompleteProvider::TYPE_SHORTCUTS)
     providers_.push_back(new ShortcutsProvider(profile));
   if (provider_types & AutocompleteProvider::TYPE_ZERO_SUGGEST) {
     zero_suggest_provider_ = ZeroSuggestProvider::Create(
         this, template_url_service, profile);
     if (zero_suggest_provider_)
       providers_.push_back(zero_suggest_provider_);
   }
+  for (auto& provider : providers_) {

[Peter Kasting, 2014/12/30 21:18:23]

Just eliminate this loop and the variable it sets and run StartOnOmniboxFocus()
all the time; when there are no run-on-focus providers it shouldn't be harmful.

[jif, 2014/12/31 19:02:26]

Done.

+    if (provider.ActivatedOnOmniboxFocus()) {
+      has_providers_for_omnibox_focus_ = true;
+      break;
+    }
+  }
 }
 
 AutocompleteController::~AutocompleteController() {
   // The providers may have tasks outstanding that hold refs to them.  We need
   // to ensure they won't call us back if they outlive us.  (Practically,
   // calling Stop() should also cancel those tasks and make it so that we hold
   // the only refs.)  We also don't want to bother notifying anyone of our
   // result changes here, because the notification observer is in the midst of
   // shutdown too, so we don't ask Stop() to clear |result_| (and notify).
   result_.Reset();  // Not really necessary.
@@ skipping 85 matching lines @@
   stop_timer_.Stop();
   done_ = true;
   if (clear_result && !result_.empty()) {
     result_.Reset();
     // NOTE: We pass in false since we're trying to only clear the popup, not
     // touch the edit... this is all a mess and should be cleaned up :(
     NotifyChanged(false);
   }
 }
 
-void AutocompleteController::StartZeroSuggest(const AutocompleteInput& input) {
-  if (zero_suggest_provider_ == NULL)
+void AutocompleteController::StartOnOmniboxFocus(
+    const AutocompleteInput& input) {
+  if (!has_providers_for_omnibox_focus_)
     return;
 
   DCHECK(!in_start_);  // We should not be already running a query.
 
   // Call Start() on all prefix-based providers with an INVALID
   // AutocompleteInput to clear out cached |matches_|, which ensures that
   // they aren't used with zero suggest.
+  bool non_empty_matches = false;
   for (Providers::iterator i(providers_.begin()); i != providers_.end(); ++i) {
-    if (i->get() == zero_suggest_provider_)
+    if (i->get().ActivatedOnOmniboxFocus()) {
       (*i)->Start(input, false);
-    else
+      if (!(*i)_->matches().empty())
+        non_empty_matches = true;
+    } else {
       (*i)->Start(AutocompleteInput(), false);
+    }
   }
 
-  if (!zero_suggest_provider_->matches().empty())
+  if (non_empty_matches)

[Peter Kasting, 2014/12/30 21:18:23]

I think you can eliminate this conditional and just always run UpdateResult(),
but test this in various cases after previously completing omnibox interaction
via hitting enter and/or escape.

[jif, 2014/12/31 19:02:26]

Done.
Looks good.

     UpdateResult(false, false);
 }
 
 void AutocompleteController::DeleteMatch(const AutocompleteMatch& match) {
   DCHECK(match.SupportsDeletion());
 
   // Delete duplicate matches attached to the main match first.
   for (ACMatches::const_iterator it(match.duplicate_matches.begin());
        it != match.duplicate_matches.end(); ++it) {
     if (it->deletable)
@@ skipping 322 matching lines @@
                         this, &AutocompleteController::ExpireCopiedEntries);
 }
 
 void AutocompleteController::StartStopTimer() {
   stop_timer_.Start(FROM_HERE,
                     stop_timer_duration_,
                     base::Bind(&AutocompleteController::Stop,
                                base::Unretained(this),
                                false));
 }