App List: Refactor ContentsSwitcherView so it doesn't hard-code pages.

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"
@@ skipping 10 matching lines @@
 
 namespace app_list {
 
 class AppsGridView;
 class ApplicationDragAndDropHost;
 class AppListFolderItem;
 class AppListMainView;
 class AppListModel;
 class AppListViewDelegate;
 class AppsContainerView;
+class ContentsSwitcherView;
 class PaginationModel;
 class SearchResultListView;
 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,
-               AppListModel* model,
-               AppListViewDelegate* view_delegate);
+  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);
+
   // 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 set_contents_switcher_view(
+      ContentsSwitcherView* contents_switcher_view) {
+    contents_switcher_view_ = contents_switcher_view;
+  }
+
   void ShowSearchResults(bool show);
   void ShowFolderContent(AppListFolderItem* folder);
   bool IsShowingSearchResults() const;
 
   // 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;
 
@@ skipping 33 matching lines @@
   void SetActivePageInternal(int page_index, bool show_search_results);
 
   // Invoked when active view is changed.
   void ActivePageChanged(bool show_search_results);
 
   // Calculates and sets the bounds for the subviews. If there is currently an
   // animation, this positions the views as appropriate for the current frame.
   void UpdatePageBounds();
 
   // 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. There is no name
+  // 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 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. The page is associated
+  // 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, NamedPage named_page);
+  int AddLauncherPage(views::View* view, int resource_id, NamedPage named_page);
 
   // Gets the PaginationModel owned by the AppsGridView.
   // Note: This is different to |pagination_model_|, which manages top-level
   // launcher-page pagination.
   PaginationModel* GetAppsPaginationModel();
 
   // Overridden from ui::EventHandler:
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
 
   // 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_;
 
   // 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_