Add support for providers called when the omnibox is focused.

chrome/browser/android/omnibox/autocomplete_controller_android.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 "chrome/browser/android/omnibox/autocomplete_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ skipping 46 matching lines @@
 using base::android::ConvertUTF16ToJavaString;
 using metrics::OmniboxEventProto;
 
 namespace {
 
 const int kAndroidAutocompleteProviders =
     AutocompleteClassifier::kDefaultOmniboxProviders;
 
 /**
  * A prefetcher class responsible for triggering zero suggest prefetch.
- * The prefetch occurs as a side-effect of calling StartZeroSuggest() on
+ * The prefetch occurs as a side-effect of calling OnOmniboxFocused() on
  * the AutocompleteController object.
  */
 class ZeroSuggestPrefetcher : public AutocompleteControllerDelegate {
  public:
   explicit ZeroSuggestPrefetcher(Profile* profile);
 
  private:
   virtual ~ZeroSuggestPrefetcher();
   void SelfDestruct();
 
   // AutocompleteControllerDelegate:
   virtual void OnResultChanged(bool default_match_changed) override;
 
   scoped_ptr<AutocompleteController> controller_;
   base::OneShotTimer<ZeroSuggestPrefetcher> expire_timer_;
 };
 
 ZeroSuggestPrefetcher::ZeroSuggestPrefetcher(Profile* profile)
     : controller_(new AutocompleteController(
           profile, TemplateURLServiceFactory::GetForProfile(profile), this,
           AutocompleteProvider::TYPE_ZERO_SUGGEST)) {
   // Creating an arbitrary fake_request_source to avoid passing in an invalid
   // AutocompleteInput object.
   base::string16 fake_request_source(base::ASCIIToUTF16(
       "http://www.foobarbazblah.com"));
-  controller_->StartZeroSuggest(AutocompleteInput(
+  controller_->OnOmniboxFocused(AutocompleteInput(
       fake_request_source, base::string16::npos, std::string(),
       GURL(fake_request_source), OmniboxEventProto::INVALID_SPEC, false, false,
       true, true, ChromeAutocompleteSchemeClassifier(profile)));
   // Delete ourselves after 10s. This is enough time to cache results or
   // give up if the results haven't been received.
   expire_timer_.Start(FROM_HERE,
                       base::TimeDelta::FromMilliseconds(10000),
                       this, &ZeroSuggestPrefetcher::SelfDestruct);
 }
 
@@ skipping 50 matching lines @@
   autocomplete_controller_->Start(input_);
 }
 
 ScopedJavaLocalRef<jobject> AutocompleteControllerAndroid::Classify(
     JNIEnv* env,
     jobject obj,
     jstring j_text) {
   return GetTopSynchronousResult(env, obj, j_text, true);
 }
 
-void AutocompleteControllerAndroid::StartZeroSuggest(
+void AutocompleteControllerAndroid::OnOmniboxFocused(
     JNIEnv* env,
     jobject obj,
     jstring j_omnibox_text,
     jstring j_current_url,
     jboolean is_query_in_omnibox,
     jboolean focused_from_fakebox) {
   if (!autocomplete_controller_)
     return;
 
   base::string16 url = ConvertJavaStringToUTF16(env, j_current_url);
   const GURL current_url = GURL(url);
   base::string16 omnibox_text = ConvertJavaStringToUTF16(env, j_omnibox_text);
 
   // If omnibox text is empty, set it to the current URL for the purposes of
   // populating the verbatim match.
   if (omnibox_text.empty())
     omnibox_text = url;
 
   input_ = AutocompleteInput(
       omnibox_text, base::string16::npos, std::string(), current_url,
       ClassifyPage(current_url, is_query_in_omnibox, focused_from_fakebox),
       false, false, true, true, ChromeAutocompleteSchemeClassifier(profile_));
-  autocomplete_controller_->StartZeroSuggest(input_);
+  autocomplete_controller_->OnOmniboxFocused(input_);
 }
 
 void AutocompleteControllerAndroid::Stop(JNIEnv* env,
                                          jobject obj,
                                          bool clear_results) {
   if (autocomplete_controller_ != NULL)
     autocomplete_controller_->Stop(clear_results);
 }
 
 void AutocompleteControllerAndroid::ResetSession(JNIEnv* env, jobject obj) {
@@ skipping 358 matching lines @@
     return;
 
   // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
   new ZeroSuggestPrefetcher(profile);
 }
 
 // Register native methods
 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }