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

ui/app_list/views/contents_switcher_view.h

 // Copyright 2014 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_SWITCHER_VIEW_H_
 #define UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_
 
 #include "base/basictypes.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 namespace app_list {
 
 class ContentsView;
 
 // A view that contains buttons to switch the displayed view in the given
 // ContentsView.
 class ContentsSwitcherView : public views::View, public views::ButtonListener {
  public:
-  explicit ContentsSwitcherView(ContentsView* contents_view);
+  explicit ContentsSwitcherView();
   virtual ~ContentsSwitcherView();
 
   ContentsView* contents_view() const { return contents_view_; }
 
+  // Initialize the ContentsSwitcherView with a ContentsView sibling. Must be
+  // called before AddSwitcherButton.
+  void Init(ContentsView* contents_view);
+
+  // Adds a switcher button using |resource_id| as the button's image, which
+  // opens the page with index |page_index| in the ContentsView.
+  void AddSwitcherButton(int resource_id, int page_index);

[calamity, 2014/06/18 05:22:29]

Add a note about resource_id of 0 being ignored.

[Matt Giuca, 2014/06/18 06:47:02]

Done.

+
  private:
-  // Adds a switcher button using |resource_id| as the button's image and |tag|
-  // as the button's id.
-  void AddSwitcherButton(int resource_id, int tag);
-
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   ContentsView* contents_view_;  // Owned by views hierarchy.
   views::View* buttons_;         // Owned by views hierarchy.
 
   DISALLOW_COPY_AND_ASSIGN(ContentsSwitcherView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_