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

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

Issue 1071093002: Implement setSearchResults. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clear results after query is ended. Created 5 years, 8 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: ui/app_list/search/mixer.cc
diff --git a/ui/app_list/search/mixer.cc b/ui/app_list/search/mixer.cc
index 5037ca0aef246cf186f9349c39e5d628ee797aa1..4781d8656a1c43b4c3bf6246a51592c2772b787a 100644
--- a/ui/app_list/search/mixer.cc
+++ b/ui/app_list/search/mixer.cc
@@ -152,6 +152,7 @@ void Mixer::MixAndPublish(bool is_voice_query,
const Group& webstore_group = *groups_[WEBSTORE_GROUP];
const Group& people_group = *groups_[PEOPLE_GROUP];
const Group& suggestions_group = *groups_[SUGGESTIONS_GROUP];
+ const Group& launcher_search_api_group = *groups_[LAUNCHER_SEARCH_API_GROUP];
Matt Giuca 2015/04/10 03:55:17 Heads up: I am going to try and land https://coder
yawano 2015/04/10 04:05:38 Okay, I'll wait until http://crrev.com/882463004 l
// Adds main group and web store results first.
results.insert(results.end(), main_group.results().begin(),
@@ -162,6 +163,8 @@ void Mixer::MixAndPublish(bool is_voice_query,
people_group.results().end());
results.insert(results.end(), suggestions_group.results().begin(),
suggestions_group.results().end());
+ results.insert(results.end(), launcher_search_api_group.results().begin(),
+ launcher_search_api_group.results().end());
// Collapse duplicate apps from local and web store.
RemoveDuplicates(&results);

Powered by Google App Engine
This is Rietveld 408576698