Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3276)

Unified Diff: chrome/browser/ui/app_list/search/search_controller.cc

Issue 15342003: app_list: Add web store search. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and address nits in #3 Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/safe_json_parser.cc ('k') | chrome/browser/ui/app_list/search/search_webstore_result.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/search/search_controller.cc
diff --git a/chrome/browser/ui/app_list/search/search_controller.cc b/chrome/browser/ui/app_list/search/search_controller.cc
index c41ea33ef51c76014b5fbb94cb2940335f413fcc..690522780d158e608c66e4bc75ae044f29a9bef6 100644
--- a/chrome/browser/ui/app_list/search/search_controller.cc
+++ b/chrome/browser/ui/app_list/search/search_controller.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/ui/app_list/search/chrome_search_result.h"
#include "chrome/browser/ui/app_list/search/omnibox_provider.h"
#include "chrome/browser/ui/app_list/search/search_provider.h"
+#include "chrome/browser/ui/app_list/search/webstore_provider.h"
#include "content/public/browser/user_metrics.h"
#include "ui/app_list/search_box_model.h"
@@ -37,13 +38,12 @@ SearchController::~SearchController() {}
void SearchController::Init() {
mixer_->Init();
- AddProvider(Mixer::MAIN_GROUP,
- scoped_ptr<SearchProvider>(
- new AppSearchProvider(profile_, list_controller_)).Pass());
- AddProvider(Mixer::OMNIBOX_GROUP,
- scoped_ptr<SearchProvider>(new OmniboxProvider(profile_)).Pass());
-
- // TODO(xiyuan): Add providers.
+ AddProvider(Mixer::MAIN_GROUP, scoped_ptr<SearchProvider>(
+ new AppSearchProvider(profile_, list_controller_)).Pass());
+ AddProvider(Mixer::OMNIBOX_GROUP, scoped_ptr<SearchProvider>(
+ new OmniboxProvider(profile_)).Pass());
+ AddProvider(Mixer::WEBSTORE_GROUP, scoped_ptr<SearchProvider>(
+ new WebstoreProvider(profile_)).Pass());
}
void SearchController::Start() {
« no previous file with comments | « chrome/browser/safe_json_parser.cc ('k') | chrome/browser/ui/app_list/search/search_webstore_result.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698