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

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

Issue 527203002: Experimental app list: Remove start page button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 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
« no previous file with comments | « no previous file | ui/resources/default_100_percent/common/app_list_search_icon.png » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index c9d09fe76b092890cc28fa2d32414f129dc2121b..3b4d620ffa723bc8276b18be45bbd5db75a73585 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -47,8 +47,7 @@ void ContentsView::InitNamedPages(AppListModel* model,
if (app_list::switches::IsExperimentalAppListEnabled()) {
start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
- AddLauncherPage(
- start_page_view_, IDR_APP_LIST_SEARCH_ICON, NAMED_PAGE_START);
+ AddLauncherPage(start_page_view_, 0, NAMED_PAGE_START);
} else {
search_results_view_ =
new SearchResultListView(app_list_main_view_, view_delegate);
@@ -245,7 +244,7 @@ int ContentsView::AddLauncherPage(views::View* view, int resource_id) {
int page_index = view_model_->view_size();
AddChildView(view);
view_model_->Add(view, page_index);
- if (contents_switcher_view_)
+ if (contents_switcher_view_ && resource_id)
contents_switcher_view_->AddSwitcherButton(resource_id, page_index);
pagination_model_.SetTotalPages(view_model_->view_size());
return page_index;
« no previous file with comments | « no previous file | ui/resources/default_100_percent/common/app_list_search_icon.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698