Refactor app list so AppsGridView owns the PaginationModel.

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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
 // and animates the transition between show states.
 class APP_LIST_EXPORT ContentsView : public views::View {
  public:
   enum ShowState {
     SHOW_APPS,
     SHOW_SEARCH_RESULTS,
     SHOW_START_PAGE,
   };
 
   ContentsView(AppListMainView* app_list_main_view,
-               PaginationModel* pagination_model,
                AppListModel* model,
                AppListViewDelegate* view_delegate);
   virtual ~ContentsView();
 
   // 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(
@@ skipping 23 matching lines @@
   void ShowStateChanged();
 
   void CalculateIdealBounds();
   void AnimateToIdealBounds();
 
   // Overridden from ui::EventHandler:
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
 
   ShowState show_state_;
-  PaginationModel* pagination_model_;  // Owned by AppListController.
+  PaginationModel* pagination_model_;  // Owned by AppListGridView.

[xiyuan, 2014/05/30 15:47:47]

AppListGridView -> AppsGridView

[Matt Giuca, 2014/06/02 07:11:23]

Done.

 
   AppsContainerView* apps_container_view_;  // Owned by the views hierarchy.
   StartPageView* start_page_view_;          // Owned by the views hierarchy.
 
   AppListMainView* app_list_main_view_;     // Parent view, owns this.
 
   scoped_ptr<views::ViewModel> view_model_;
   scoped_ptr<views::BoundsAnimator> bounds_animator_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentsView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_