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

Unified Diff: athena/home/app_list_view_delegate.h

Issue 640103002: Adds full-functional search results for Athena on Chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix DEPS Created 6 years, 2 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 | « athena/extensions/shell/url_search_provider.cc ('k') | athena/home/app_list_view_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/app_list_view_delegate.h
diff --git a/athena/home/app_list_view_delegate.h b/athena/home/app_list_view_delegate.h
index 8bf25d59d81a2e9640a4b5fddeba16ad0e33fd62..d5a1321ef55ea653a6832e59adfe26568931bcf9 100644
--- a/athena/home/app_list_view_delegate.h
+++ b/athena/home/app_list_view_delegate.h
@@ -10,22 +10,20 @@
#include "ui/app_list/app_list_view_delegate.h"
namespace app_list {
-class SearchProvider;
+class SearchController;
}
namespace athena {
class AppModelBuilder;
+class SearchControllerFactory;
class AppListViewDelegate : public app_list::AppListViewDelegate {
public:
- explicit AppListViewDelegate(AppModelBuilder* model_builder);
+ AppListViewDelegate(AppModelBuilder* model_builder,
+ SearchControllerFactory* search_factory);
virtual ~AppListViewDelegate();
- void RegisterSearchProvider(app_list::SearchProvider* search_provider);
-
private:
- void SearchResultChanged();
-
// Overridden from app_list::AppListViewDelegate:
virtual bool ForceNativeDesktop() const override;
virtual void SetProfileByPath(const base::FilePath& profile_path) override;
@@ -64,8 +62,7 @@ class AppListViewDelegate : public app_list::AppListViewDelegate {
scoped_ptr<app_list::AppListModel> model_;
scoped_ptr<app_list::SpeechUIModel> speech_ui_;
Users users_;
-
- std::vector<app_list::SearchProvider*> search_providers_;
+ scoped_ptr<app_list::SearchController> search_controller_;
DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
};
« no previous file with comments | « athena/extensions/shell/url_search_provider.cc ('k') | athena/home/app_list_view_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698