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

Unified Diff: ui/app_list/views/app_list_main_view.cc

Issue 307333002: Add search results to experimental app list start page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « no previous file | ui/app_list/views/contents_view.h » ('j') | ui/app_list/views/contents_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_main_view.cc
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
index dcb57803c4acf6d55539b8c7838c12b0baa27f7b..94b951277077a8be9bb8b9767a28677e9ac942ce 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -253,7 +253,14 @@ void AppListMainView::QueryChanged(SearchBoxView* sender) {
base::string16 query;
base::TrimWhitespace(model_->search_box()->text(), base::TRIM_ALL, &query);
bool should_show_search = !query.empty();
- contents_view_->ShowSearchResults(should_show_search);
+
+ ContentsView::ShowState show_state = ContentsView::SHOW_SEARCH_RESULTS;
+ if (!should_show_search) {
+ show_state = app_list::switches::IsExperimentalAppListEnabled()
+ ? ContentsView::SHOW_START_PAGE
+ : ContentsView::SHOW_APPS;
+ }
+ contents_view_->SetShowState(show_state);
if (should_show_search)
delegate_->StartSearch();
« no previous file with comments | « no previous file | ui/app_list/views/contents_view.h » ('j') | ui/app_list/views/contents_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698