autocomplete: Add AutocompleteProvider::Type enum.

chrome/browser/ui/app_list/search_builder.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/ui/app_list/search_builder.h"
 
 #include <string>
 
 #include "base/command_line.h"
+#include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
+#include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
-#include "chrome/browser/autocomplete/extension_app_provider.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ skipping 156 matching lines @@
     AppListController* list_controller)
     : profile_(profile),
       search_box_(search_box),
       results_(results),
       list_controller_(list_controller) {
   search_box_->SetHintText(
       l10n_util::GetStringUTF16(IDS_SEARCH_BOX_HINT));
   search_box_->SetIcon(*ui::ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          app_list::switches::kAppListShowAppsOnly)) {
-    // ExtensionAppProvider is a synchronous provider and does not really need a
-    // listener.
-    apps_provider_ = new ExtensionAppProvider(NULL, profile);
-  } else {
-    controller_.reset(new AutocompleteController(profile, this));
-  }
+  int providers =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          app_list::switches::kAppListShowAppsOnly) ?
+      AutocompleteProvider::TYPE_EXTENSION_APP :
+      AutocompleteClassifier::kDefaultOmniboxProviders;

[Peter Kasting, 2012/09/07 23:23:02]

Nit: You might want at least a TODO about supporting fewer providers here?  For
example, do you want the keyword provider or the zerosuggest provider?

[Daniel Erat, 2012/09/08 16:37:36]

Done.

+  controller_.reset(new AutocompleteController(profile, this, providers));
 }
 
 SearchBuilder::~SearchBuilder() {
 }
 
 void SearchBuilder::StartSearch() {
-  const string16& user_text = search_box_->text();
-
-  if (controller_.get()) {
-    // Omnibox features such as keyword selection/accepting and instant query
-    // are not implemented.
-    // TODO(xiyuan): Figure out the features that need to support here.
-    controller_->Start(user_text, string16(), false, false, true,
-        AutocompleteInput::ALL_MATCHES);
-  } else {
-    AutocompleteInput input(user_text, string16(), false, false, true,
-        AutocompleteInput::ALL_MATCHES);
-    apps_provider_->Start(input, false);
-
-    // ExtensionAppProvider is a synchronous provider and results are ready
-    // after returning from Start.
-    AutocompleteResult ac_result;
-    ac_result.AppendMatches(apps_provider_->matches());
-    ac_result.SortAndCull(input);
-    PopulateFromACResult(ac_result);
-  }
+  // Omnibox features such as keyword selection/accepting and instant query
+  // are not implemented.
+  // TODO(xiyuan): Figure out the features that need to support here.
+  controller_->Start(search_box_->text(), string16(), false, false, true,

[Peter Kasting, 2012/09/07 23:23:02]

Nice simplification!

+      AutocompleteInput::ALL_MATCHES);
 }
 
 void SearchBuilder::StopSearch() {
-  if (controller_.get())
-    controller_->Stop(true);
-  else
-    apps_provider_->Stop(true);
+  controller_->Stop(true);
 }
 
 void SearchBuilder::OpenResult(const app_list::SearchResult& result,
                                int event_flags) {
   const SearchBuilderResult* builder_result =
       static_cast<const SearchBuilderResult*>(&result);
   const AutocompleteMatch& match = builder_result->match();
 
   // Count AppList.Search here because it is composed of search + action.
   content::RecordAction(content::UserMetricsAction("AppList_Search"));
@@ skipping 29 matching lines @@
        ++it) {
     results_->Add(new SearchBuilderResult(profile_, *it));
   }
 }
 
 void SearchBuilder::OnResultChanged(bool default_match_changed) {
   // TODO(xiyuan): Handle default match properly.
   const AutocompleteResult& ac_result = controller_->result();
   PopulateFromACResult(ac_result);
 }