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

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

Issue 23874015: Implement people search. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/mixer.cc
diff --git a/chrome/browser/ui/app_list/search/mixer.cc b/chrome/browser/ui/app_list/search/mixer.cc
index 3466d501119fd8a70a676fc67f66c989b762057c..18c28fedc8062bc8735efb316530733b4b9450b3 100644
--- a/chrome/browser/ui/app_list/search/mixer.cc
+++ b/chrome/browser/ui/app_list/search/mixer.cc
@@ -20,6 +20,7 @@ namespace {
const size_t kMaxResults = 6;
const size_t kMaxMainGroupResults = 4;
const size_t kMaxWebstoreResults = 2;
+const size_t kMaxPeopleResults = 2;
// A value to indicate no max number of results limit.
const size_t kNoMaxResultsLimit = 0;
@@ -171,9 +172,10 @@ Mixer::Mixer(AppListModel::SearchResults* ui_results)
Mixer::~Mixer() {}
void Mixer::Init() {
- groups_.push_back(new Group(kMaxMainGroupResults, 2.0));
- groups_.push_back(new Group(kNoMaxResultsLimit, 1.0));
- groups_.push_back(new Group(kMaxWebstoreResults, 0.0));
+ groups_.push_back(new Group(kMaxMainGroupResults, 3.0));
+ groups_.push_back(new Group(kNoMaxResultsLimit, 2.0));
+ groups_.push_back(new Group(kMaxWebstoreResults, 1.0));
+ groups_.push_back(new Group(kMaxPeopleResults, 0.0));
}
void Mixer::AddProviderToGroup(GroupId group, SearchProvider* provider) {
@@ -194,6 +196,9 @@ void Mixer::MixAndPublish(const KnownResults& known_results) {
results.insert(results.end(),
groups_[WEBSTORE_GROUP]->results().begin(),
groups_[WEBSTORE_GROUP]->results().end());
+ results.insert(results.end(),
+ groups_[PEOPLE_GROUP]->results().begin(),
+ groups_[PEOPLE_GROUP]->results().end());
// Collapse duplicate apps from local and web store.
RemoveDuplicates(&results);

Powered by Google App Engine
This is Rietveld 408576698