Commit dafbe958 authored by mgiuca's avatar mgiuca Committed by Commit bot

Revert "Experimental app list: Move custom launcher pages to the end."

This partially reverts commit 74d15398 (r292900).

(But we keep a small refactor to make it easier to reorder these buttons
in the future.)

BUG=406222

Review URL: https://codereview.chromium.org/555763002

Cr-Commit-Position: refs/heads/master@{#294062}
parent 37117ac3
...@@ -46,6 +46,15 @@ void ContentsView::InitNamedPages(AppListModel* model, ...@@ -46,6 +46,15 @@ void ContentsView::InitNamedPages(AppListModel* model,
DCHECK(model); DCHECK(model);
if (app_list::switches::IsExperimentalAppListEnabled()) { 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); start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
AddLauncherPage(start_page_view_, 0, NAMED_PAGE_START); AddLauncherPage(start_page_view_, 0, NAMED_PAGE_START);
} else { } else {
...@@ -60,17 +69,6 @@ void ContentsView::InitNamedPages(AppListModel* model, ...@@ -60,17 +69,6 @@ void ContentsView::InitNamedPages(AppListModel* model,
AddLauncherPage( AddLauncherPage(
apps_container_view_, IDR_APP_LIST_APPS_ICON, NAMED_PAGE_APPS); 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() int initial_page_index = app_list::switches::IsExperimentalAppListEnabled()
? GetPageIndexForNamedPage(NAMED_PAGE_START) ? GetPageIndexForNamedPage(NAMED_PAGE_START)
: GetPageIndexForNamedPage(NAMED_PAGE_APPS); : GetPageIndexForNamedPage(NAMED_PAGE_APPS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment