Refactor app list so AppsGridView owns the PaginationModel.

ui/app_list/views/app_list_main_view.h

 // Copyright 2013 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_APP_LIST_MAIN_VIEW_H_
 #define UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/app_list/app_list_export.h"
 #include "ui/app_list/views/apps_grid_view_delegate.h"
 #include "ui/app_list/views/search_box_view_delegate.h"
 #include "ui/app_list/views/search_result_list_view_delegate.h"
 #include "ui/views/view.h"
 
 namespace views {
 class Widget;
 }
 
 namespace app_list {
 
 class AppListItem;
 class AppListModel;
 class AppListViewDelegate;
 class ApplicationDragAndDropHost;
 class ContentsView;
 class PaginationModel;

[tapted, 2014/06/02 04:02:21]

Depending what else uses it.. this could possibly be removed from here.

That is, I think (critically) only AppListView, AppsGridView and PageSwitcher
now need knowledge about PaginationView. If it can be purged from all other
files in ui/app_list/ then that would be a win IMO

(note AppListView* doesn't _really_ need to know, but I think something at the
top level in /ui/app_list needs to expose it to avoid an explosion of
dependencies)

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

Yeah, I was planning to clean up the use of PaginationModel in AppListMainView
and ContentsView in a follow-up CL. Their use of PaginationModel is non-trivial,
but I think it could be moved.

 class SearchBoxView;
 
 // AppListMainView contains the normal view of the app list, which is shown
 // when the user is signed in.
 class APP_LIST_EXPORT AppListMainView : public views::View,
                                         public AppsGridViewDelegate,
                                         public SearchBoxViewDelegate,
                                         public SearchResultListViewDelegate {
  public:
   // Takes ownership of |delegate|.
   explicit AppListMainView(AppListViewDelegate* delegate,
-                           PaginationModel* pagination_model,
                            gfx::NativeView parent);
   virtual ~AppListMainView();
 
   void ShowAppListWhenReady();
 
   void ResetForShow();
 
   void Close();
 
   void Prerender();
@@ skipping 41 matching lines @@
       const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE;
 
   // Overridden from SearchBoxViewDelegate:
   virtual void QueryChanged(SearchBoxView* sender) OVERRIDE;
 
   // Overridden from SearchResultListViewDelegate:
   virtual void OnResultInstalled(SearchResult* result) OVERRIDE;
   virtual void OnResultUninstalled(SearchResult* result) OVERRIDE;
 
   AppListViewDelegate* delegate_;  // Owned by parent view (AppListView).
-  PaginationModel* pagination_model_;  // Owned by AppListController.
+  PaginationModel* pagination_model_;  // Owned by AppListGridView.

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

nit: AppListGridView -> AppsGridView

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

Done.

   AppListModel* model_;  // Unowned; ownership is handled by |delegate_|.
 
   SearchBoxView* search_box_view_;  // Owned by views hierarchy.
   ContentsView* contents_view_;  // Owned by views hierarchy.
 
   // A timer that fires when maximum allowed time to wait for icon loading has
   // passed.
   base::OneShotTimer<AppListMainView> icon_loading_wait_timer_;
 
   ScopedVector<IconLoader> pending_icon_loaders_;
 
   base::WeakPtrFactory<AppListMainView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListMainView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_