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

ui/app_list/views/contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/contents_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 38 matching lines @@
   pagination_model_.RemoveObserver(this);
   if (contents_switcher_view_)
     pagination_model_.RemoveObserver(contents_switcher_view_);
 }
 
 void ContentsView::InitNamedPages(AppListModel* model,
                                   AppListViewDelegate* view_delegate) {
   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_, IDR_APP_LIST_SEARCH_ICON, NAMED_PAGE_START);
   } else {
     search_results_view_ =
         new SearchResultListView(app_list_main_view_, view_delegate);
     AddLauncherPage(search_results_view_, 0, NAMED_PAGE_SEARCH_RESULTS);
     search_results_view_->SetResults(model->results());
   }
 
   apps_container_view_ = new AppsContainerView(app_list_main_view_, model);
 
-  int initial_page_index = AddLauncherPage(
+  AddLauncherPage(
       apps_container_view_, IDR_APP_LIST_APPS_ICON, NAMED_PAGE_APPS);
-  if (app_list::switches::IsExperimentalAppListEnabled())
-    initial_page_index = GetPageIndexForNamedPage(NAMED_PAGE_START);
+
+  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);
 
   page_before_search_ = initial_page_index;
   pagination_model_.SelectPage(initial_page_index, false);
 
   // Needed to update the main search box visibility.
   ActivePageChanged(false);
 }
 
 void ContentsView::CancelDrag() {
   if (apps_container_view_->apps_grid_view()->has_dragged_view())
@@ skipping 293 matching lines @@
   if (std::abs(offset) > kMinScrollToSwitchPage) {
     if (!GetAppsPaginationModel()->has_transition()) {
       GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list