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

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: 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
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 3014465cd3fb91dc842760b3d04c835e4911502a..663eb3b06d4f0ae1656c6e162e96261798d9e506 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 "ui/app_list/search_box_model.h"
namespace app_list {
@@ -36,13 +37,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>(
James Cook 2013/05/20 14:39:34 I really like this approach of having a generic li
+ 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() {

Powered by Google App Engine
This is Rietveld 408576698