Change ContentsView::SetActivePage to use States rather than indexes.

ui/app_list/views/app_list_main_view.cc

 // Copyright 2013 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/app_list_main_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 126 matching lines @@
   if (icon_loading_wait_timer_.IsRunning())
     return;
 
   icon_loading_wait_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kMaxIconLoadingWaitTimeInMs),
       this, &AppListMainView::OnIconLoadingWaitTimer);
 }
 
 void AppListMainView::ResetForShow() {
-  if (switches::IsExperimentalAppListEnabled()) {
-    contents_view_->SetActivePage(
-        contents_view_->GetPageIndexForState(AppListModel::STATE_START));
-  }
+  if (switches::IsExperimentalAppListEnabled())
+    contents_view_->SetActivePage(AppListModel::STATE_START);
+
   contents_view_->apps_container_view()->ResetForShowApps();
   // We clear the search when hiding so when app list appears it is not showing
   // search results.
   search_box_view_->ClearSearch();
 }
 
 void AppListMainView::Close() {
   icon_loading_wait_timer_.Stop();
   contents_view_->CancelDrag();
 }
@@ skipping 90 matching lines @@
 }
 
 void AppListMainView::UpdateCustomLauncherPageVisibility() {
   if (ShouldShowCustomLauncherPage()) {
     // Make the custom page view visible again.
     contents_view_->custom_page_view()->SetVisible(true);
   } else if (contents_view_->IsStateActive(
                  AppListModel::STATE_CUSTOM_LAUNCHER_PAGE)) {
     // Animate to the start page if currently on the custom page view. The view
     // will hide on animation completion.
-    contents_view_->SetActivePage(
-        contents_view_->GetPageIndexForState(AppListModel::STATE_START));
+    contents_view_->SetActivePage(AppListModel::STATE_START);
   } else {
     // Hide the view immediately otherwise.
     contents_view_->custom_page_view()->SetVisible(false);
   }
 }
 
 void AppListMainView::OnCustomLauncherPageEnabledStateChanged(bool enabled) {
   if (enabled) {
     // Make the custom page view visible again.
     contents_view_->custom_page_view()->SetVisible(true);
   } else if (contents_view_->IsStateActive(
                  AppListModel::STATE_CUSTOM_LAUNCHER_PAGE)) {
     // Animate to the start page if currently on the custom page view. The view
     // will hide on animation completion.
-    contents_view_->SetActivePage(
-        contents_view_->GetPageIndexForState(AppListModel::STATE_START));
+    contents_view_->SetActivePage(AppListModel::STATE_START);
   } else {
     // Hide the view immediately otherwise.
     contents_view_->custom_page_view()->SetVisible(false);
   }
 }
 
 void AppListMainView::OnSearchEngineIsGoogleChanged(bool is_google) {
   if (contents_view_->custom_page_view())
     OnCustomLauncherPageEnabledStateChanged(is_google);
 
@@ skipping 42 matching lines @@
     contents_view_->search_results_page_view()->SetSelection(select);
 }
 
 void AppListMainView::OnResultInstalled(SearchResult* result) {
   // Clears the search to show the apps grid. The last installed app
   // should be highlighted and made visible already.
   search_box_view_->ClearSearch();
 }
 
 }  // namespace app_list