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::SetActiveState(AppListModel::State state) {
+  SetActiveState(state, true);
 }
 
-void ContentsView::SetActivePage(int page_index, bool animate) {
-  if (GetActivePageIndex() == page_index)
+void ContentsView::SetActiveState(AppListModel::State state, bool animate) {
+  if (IsStateActive(state))
     return;
 
-  SetActivePageInternal(page_index, false, animate);
+  SetActiveStateInternal(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 20 matching lines @@
   if (it == view_to_state_.end())
     return AppListModel::INVALID_STATE;
 
   return it->second;
 }
 
 int ContentsView::NumLauncherPages() const {
   return pagination_model_.total_pages();
 }
 
-void ContentsView::SetActivePageInternal(int page_index,
-                                         bool show_search_results,
-                                         bool animate) {
+void ContentsView::SetActiveStateInternal(int page_index,
+                                          bool show_search_results,
+                                          bool animate) {
   if (!GetPageView(page_index)->visible())
     return;
 
   if (!show_search_results)
     page_before_search_ = page_index;
   // Start animating to the new page.
   pagination_model_.SelectPage(page_index, animate);
   ActivePageChanged();
 
   if (!animate)
@@ skipping 34 matching lines @@
   if (custom_page_view_) {
     custom_page_view_->SetFocusable(state ==
                                     AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
   }
 }
 
 void ContentsView::ShowSearchResults(bool show) {
   int search_page = GetPageIndexForState(AppListModel::STATE_SEARCH_RESULTS);
   DCHECK_GE(search_page, 0);
 
-  SetActivePageInternal(show ? search_page : page_before_search_, show, true);
+  SetActiveStateInternal(show ? search_page : page_before_search_, show, true);
 }
 
 bool ContentsView::IsShowingSearchResults() const {
   return IsStateActive(AppListModel::STATE_SEARCH_RESULTS);
 }
 
 void ContentsView::NotifyCustomLauncherPageAnimationChanged(double progress,
                                                             int current_page,
                                                             int target_page) {
   int custom_launcher_page_index =
@@ skipping 77 matching lines @@
 }
 
 views::View* ContentsView::GetPageView(int index) const {
   return view_model_->view_at(index);
 }
 
 SearchBoxView* ContentsView::GetSearchBoxView() const {
   return app_list_main_view_->search_box_view();
 }
 
-void ContentsView::AddBlankPageForTesting() {
-  AddLauncherPage(new views::View);
-  pagination_model_.SetTotalPages(view_model_->view_size());
-}
-
 int ContentsView::AddLauncherPage(views::View* view) {
   int page_index = view_model_->view_size();
   AddChildView(view);
   view_model_->Add(view, page_index);
   return page_index;
 }
 
 int ContentsView::AddLauncherPage(views::View* view,
                                   AppListModel::State state) {
   int page_index = AddLauncherPage(view);
@@ skipping 72 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));
+        SetActiveState(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));
+        SetActiveState(AppListModel::STATE_START);
       break;
     case AppListModel::STATE_SEARCH_RESULTS:
       GetSearchBoxView()->ClearSearch();
       ShowSearchResults(false);
       break;
     case AppListModel::INVALID_STATE:  // Falls through.
       NOTREACHED();
       break;
   }
   return true;
@@ skipping 95 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list