Move ContentsView::NamedPage to AppListModel::ShowState.

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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/app_list/app_list_export.h"
+#include "ui/app_list/app_list_model.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/pagination_model_observer.h"
 #include "ui/views/view.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class ViewModel;
@@ skipping 14 matching lines @@
 class StartPageView;
 
 // A view to manage launcher pages within the Launcher (eg. start page, apps
 // grid view, search results). There can be any number of launcher pages, only
 // one of which can be active at a given time. ContentsView provides the user
 // interface for switching between launcher pages, and animates the transition
 // between them.
 class APP_LIST_EXPORT ContentsView : public views::View,
                                      public PaginationModelObserver {
  public:
-  // Values of this enum denote special launcher pages that require hard-coding.
-  // Launcher pages are not required to have a NamedPage enum value.
-  enum NamedPage {
-    NAMED_PAGE_APPS,
-    NAMED_PAGE_SEARCH_RESULTS,
-    NAMED_PAGE_START,
-  };
-
   ContentsView(AppListMainView* app_list_main_view);
   virtual ~ContentsView();
 
-  // Initialize the named (special) pages of the launcher. In the experimental
-  // launcher, should be called after set_contents_switcher_view(), or switcher
-  // buttons will not be created.
-  void InitNamedPages(AppListModel* model, AppListViewDelegate* view_delegate);
+  // Initialize the pages of the launcher. In the experimental launcher, should
+  // be called after set_contents_switcher_view(), or switcher buttons will not
+  // be created.
+  void Init(AppListModel* model, AppListViewDelegate* view_delegate);
 
   // The app list gets closed and drag and drop operations need to be cancelled.
   void CancelDrag();
 
   // If |drag_and_drop| is not NULL it will be called upon drag and drop
   // operations outside the application list.
   void SetDragAndDropHostOfCurrentAppList(
       ApplicationDragAndDropHost* drag_and_drop_host);
 
   void SetContentsSwitcherView(ContentsSwitcherView* contents_switcher_view);
 
   // 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);
 
   // The index of the currently active launcher page.
   int GetActivePageIndex() const;
 
-  // True if |named_page| is the current active laucher page.
-  bool IsNamedPageActive(NamedPage named_page) const;
+  // True if |show_state| is the current active laucher page.
+  bool IsShowStateActive(AppListModel::ShowState show_state) const;
 
-  // Gets the index of a launcher page in |view_model_|, by NamedPage. Returns
-  // -1 if there is no view for |named_page|.
-  int GetPageIndexForNamedPage(NamedPage named_page) const;
+  // Gets the index of a launcher page in |view_model_|, by ShowState. Returns
+  // -1 if there is no view for |show_state|.
+  int GetPageIndexForShowState(AppListModel::ShowState show_state) const;
 
   int NumLauncherPages() const;
 
   void Prerender();
 
   AppsContainerView* apps_container_view() { return apps_container_view_; }
   StartPageView* start_page_view() { return start_page_view_; }
   SearchResultListView* search_results_view() { return search_results_view_; }
   views::View* GetPageView(int index);
 
@@ skipping 41 matching lines @@
 
   // Adds |view| as a new page to the end of the list of launcher pages. The
   // view is inserted as a child of the ContentsView, and a button with
   // |resource_id| is added to the ContentsSwitcherView. There is no name
   // associated with the page. Returns the index of the new page.
   int AddLauncherPage(views::View* view, int resource_id);
 
   // Adds |view| as a new page to the end of the list of launcher pages. The
   // view is inserted as a child of the ContentsView, and a button with
   // |resource_id| is added to the ContentsSwitcherView. The page is associated
-  // with the name |named_page|. Returns the index of the new page.
-  int AddLauncherPage(views::View* view, int resource_id, NamedPage named_page);
+  // with the name |show_state|. Returns the index of the new page.
+  int AddLauncherPage(views::View* view,
+                      int resource_id,
+                      AppListModel::ShowState show_state);
 
   // Gets the PaginationModel owned by the AppsGridView.
   // Note: This is different to |pagination_model_|, which manages top-level
   // launcher-page pagination.
   PaginationModel* GetAppsPaginationModel();
 
   // Special sub views of the ContentsView. All owned by the views hierarchy.
   AppsContainerView* apps_container_view_;
   SearchResultListView* search_results_view_;
   StartPageView* start_page_view_;
 
   AppListMainView* app_list_main_view_;     // Parent view, owns this.
   // Sibling view, owned by |app_list_main_view_|.
   ContentsSwitcherView* contents_switcher_view_;
 
   scoped_ptr<views::ViewModel> view_model_;
-  // Maps NamedPage onto |view_model_| indices.
-  std::map<NamedPage, int> named_page_to_view_;
+  // Maps ShowState onto |view_model_| indices.
+  std::map<AppListModel::ShowState, int> show_state_to_view_;
 
   // The page that was showing before ShowSearchResults(true) was invoked.
   int page_before_search_;
 
   // Manages the pagination for the launcher pages.
   PaginationModel pagination_model_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentsView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_