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

ui/app_list/views/contents_view.h

 // 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.
 
 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 
 #include <map>
 #include <utility>
 
@@ skipping 52 matching lines @@
 
   // Shows/hides the search results. Hiding the search results will cause the
   // app list to return to the page that was displayed before
   // ShowSearchResults(true) was invoked.
   void ShowSearchResults(bool show);
   bool IsShowingSearchResults() const;
 
   void ShowFolderContent(AppListFolderItem* folder);
 
   // Sets the active launcher page and animates the pages into place.
-  void SetActivePage(int page_index);
-  void SetActivePage(int page_index, bool animate);
+  void SetActiveState(AppListModel::State state);
+  void SetActiveState(AppListModel::State state, bool animate);
 
   // The index of the currently active launcher page.
   int GetActivePageIndex() const;
 
   // The currently active state.
   AppListModel::State GetActiveState() const;
 
   // True if |state| is the current active laucher page.
   bool IsStateActive(AppListModel::State state) const;
 
@@ skipping 16 matching lines @@
   views::View* custom_page_view() const { return custom_page_view_; }
   SearchResultPageView* search_results_page_view() {
     return search_results_page_view_;
   }
   views::View* GetPageView(int index) const;
 
   SearchBoxView* GetSearchBoxView() const;
 
   AppListMainView* app_list_main_view() const { return app_list_main_view_; }
 
-  // Adds a blank launcher page. For use in tests only.
-  void AddBlankPageForTesting();
-
   // Returns the pagination model for the ContentsView.
   const PaginationModel& pagination_model() { return pagination_model_; }
 
   // Gets the on-screen page bounds for a given launcher page with index
   // |page_index|.
   gfx::Rect GetOnscreenPageBounds(int page_index) const;
 
   // Gets the the off-screen resting place for a given launcher page with index
   // |page_index|.
   gfx::Rect GetOffscreenPageBounds(int page_index) const;
@@ skipping 35 matching lines @@
 
   // Overridden from PaginationModelObserver:
   void TotalPagesChanged() override;
   void SelectedPageChanged(int old_selected, int new_selected) override;
   void TransitionStarted() override;
   void TransitionChanged() override;
 
  private:
   // Sets the active launcher page, accounting for whether the change is for
   // search results.
-  void SetActivePageInternal(int page_index,
-                             bool show_search_results,
-                             bool animate);
+  void SetActiveStateInternal(int page_index,
+                              bool show_search_results,
+                              bool animate);
 
   // Invoked when active view is changed.
   void ActivePageChanged();
 
   // Returns the size of the default content area.
   gfx::Size GetDefaultContentsSize() const;
 
   // Notifies the view delegate that the custom launcher page's animation has
   // changed.
   void NotifyCustomLauncherPageAnimationChanged(double progress,
@@ skipping 64 matching lines @@
 
   // The animator for transitions not found in |contents_animators_|.
   scoped_ptr<ContentsAnimator> default_animator_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentsView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_