Add a SearchResultPageView to the experimental app list.

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 15 matching lines @@
 class AppsGridView;
 class ApplicationDragAndDropHost;
 class AppListFolderItem;
 class AppListMainView;
 class AppListModel;
 class AppListViewDelegate;
 class AppsContainerView;
 class ContentsSwitcherView;
 class PaginationModel;
 class SearchResultListView;
+class SearchResultPageView;
 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:
@@ skipping 35 matching lines @@
   // Gets the index of a launcher page in |view_model_|, by State. Returns
   // -1 if there is no view for |state|.
   int GetPageIndexForState(AppListModel::State 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_; }
+  SearchResultListView* search_results_list_view() {
+    return search_results_list_view_;
+  }
+  SearchResultPageView* search_results_page_view() {
+    return search_results_page_view_;
+  }
   views::View* GetPageView(int index);
 
   // 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_; }
 
   // Returns search box bounds to use for content views that do not specify
   // their own custom layout.
@@ skipping 13 matching lines @@
   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);
 
   // Invoked when active view is changed.
-  void ActivePageChanged(bool show_search_results);
+  void ActivePageChanged();
 
   // Returns the size of the default content area.
   gfx::Size GetDefaultContentsSize() const;
 
   // Gets the origin (the off-screen resting place) for a given launcher page
   // with index |page_index|.
   gfx::Rect GetOffscreenPageBounds(int page_index) const;
 
   // Calculates and sets the bounds for the subviews. If there is currently an
   // animation, this positions the views as appropriate for the current frame.
@@ skipping 13 matching lines @@
                       int resource_id,
                       AppListModel::State 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_;
+  SearchResultListView* search_results_list_view_;

[Matt Giuca, 2014/10/29 03:40:53]

Is it now the case that search_results_list_view_ is only used by classic
launcher, and search_results_page_view_ is only used by experimental launcher?
Please document if so. (Otherwise, I'm not sure why you have both here.)

[calamity, 2014/10/29 06:27:53]

Done.

+  SearchResultPageView* search_results_page_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 State onto |view_model_| indices.
   std::map<AppListModel::State, int> state_to_view_;
 
   // Maps |view_model_| indices onto State.
   std::map<int, AppListModel::State> view_to_state_;
 
   // 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_