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 309 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)
-    return;
-
+void AutocompleteController::OnOmniboxFocused(const AutocompleteInput& input) {
   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.
   for (Providers::iterator i(providers_.begin()); i != providers_.end(); ++i) {
-    if (i->get() == zero_suggest_provider_)
+    if ((*i)->ProvidesMatchesOnOmniboxFocus())
       (*i)->Start(input, false);
     else
       (*i)->Start(AutocompleteInput(), false);
   }
 
-  if (!zero_suggest_provider_->matches().empty())
-    UpdateResult(false, false);
+  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)
       it->provider->DeleteMatch(*it);
@@ skipping 321 matching lines @@
                         this, &AutocompleteController::ExpireCopiedEntries);
 }
 
 void AutocompleteController::StartStopTimer() {
   stop_timer_.Start(FROM_HERE,
                     stop_timer_duration_,
                     base::Bind(&AutocompleteController::Stop,
                                base::Unretained(this),
                                false));
 }