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

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

Issue 555763002: Revert "Experimental app list: Move custom launcher pages to the end." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | no next file » | 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 3b4d620ffa723bc8276b18be45bbd5db75a73585..7297b071e629353b744f2e49c4dce66d25947fde 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -46,6 +46,15 @@ void ContentsView::InitNamedPages(AppListModel* model,
DCHECK(model);
if (app_list::switches::IsExperimentalAppListEnabled()) {
+ std::vector<views::View*> custom_page_views =
+ view_delegate->CreateCustomPageWebViews(GetLocalBounds().size());
+ for (std::vector<views::View*>::const_iterator it =
+ custom_page_views.begin();
+ it != custom_page_views.end();
+ ++it) {
+ AddLauncherPage(*it, IDR_APP_LIST_NOTIFICATIONS_ICON);
+ }
+
start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
AddLauncherPage(start_page_view_, 0, NAMED_PAGE_START);
} else {
@@ -60,17 +69,6 @@ void ContentsView::InitNamedPages(AppListModel* model,
AddLauncherPage(
apps_container_view_, IDR_APP_LIST_APPS_ICON, NAMED_PAGE_APPS);
- if (app_list::switches::IsExperimentalAppListEnabled()) {
- std::vector<views::View*> custom_page_views =
- view_delegate->CreateCustomPageWebViews(GetLocalBounds().size());
- for (std::vector<views::View*>::const_iterator it =
- custom_page_views.begin();
- it != custom_page_views.end();
- ++it) {
- AddLauncherPage(*it, IDR_APP_LIST_NOTIFICATIONS_ICON);
- }
- }
-
int initial_page_index = app_list::switches::IsExperimentalAppListEnabled()
? GetPageIndexForNamedPage(NAMED_PAGE_START)
: GetPageIndexForNamedPage(NAMED_PAGE_APPS);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698