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 SetActivePage(AppListModel::State state);

[Matt Giuca, 2015/02/23 23:57:27]

I think this should be renamed to SetActiveState.

[calamity, 2015/02/24 06:40:24]

Done.

+  void SetActivePage(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 161 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_