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

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 113 matching lines @@
     apps_container_view_->app_list_folder_view()->items_grid_view()->EndDrag(
         true);
   }
 }
 
 void ContentsView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   apps_container_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
-void ContentsView::SetActivePage(int page_index) {
-  SetActivePage(page_index, true);
+void ContentsView::SetActivePage(AppListModel::State state) {
+  SetActivePage(state, true);
 }
 
-void ContentsView::SetActivePage(int page_index, bool animate) {
-  if (GetActivePageIndex() == page_index)
+void ContentsView::SetActivePage(AppListModel::State state, bool animate) {
+  if (IsStateActive(state))
     return;
 
-  SetActivePageInternal(page_index, false, animate);
+  SetActivePageInternal(GetPageIndexForState(state), false, animate);
 }
 
 int ContentsView::GetActivePageIndex() const {
   // The active page is changed at the beginning of an animation, not the end.
   return pagination_model_.SelectedTargetPage();
 }
 
 AppListModel::State ContentsView::GetActiveState() const {
   return GetStateForPageIndex(GetActivePageIndex());
 }
@@ skipping 272 matching lines @@
 bool ContentsView::Back() {
   AppListModel::State state = view_to_state_[GetActivePageIndex()];
   switch (state) {
     case AppListModel::STATE_START:
       // Close the app list when Back() is called from the start page.
       return false;
     case AppListModel::STATE_CUSTOM_LAUNCHER_PAGE:
       if (app_list_main_view_->model()->PopCustomLauncherPageSubpage())
         app_list_main_view_->view_delegate()->CustomLauncherPagePopSubpage();
       else
-        SetActivePage(GetPageIndexForState(AppListModel::STATE_START));
+        SetActivePage(AppListModel::STATE_START);
       break;
     case AppListModel::STATE_APPS:
       if (apps_container_view_->IsInFolderView())
         apps_container_view_->app_list_folder_view()->CloseFolderPage();
       else
-        SetActivePage(GetPageIndexForState(AppListModel::STATE_START));
+        SetActivePage(AppListModel::STATE_START);
       break;
     case AppListModel::STATE_SEARCH_RESULTS:
       GetSearchBoxView()->ClearSearch();
       ShowSearchResults(false);
       break;
     case AppListModel::INVALID_STATE:
       NOTREACHED();
       break;
   }
   return true;
@@ skipping 95 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list