Refactor app list so AppsGridView owns the PaginationModel.

ui/app_list/views/apps_grid_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_APPS_GRID_VIEW_H_
 #define UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"

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

nit: unused?

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

Done.

[Matt Giuca, 2014/06/03 01:52:36]

Actually, ref_counted.h is used (not by my code, but by some existing code), so
I'm adding this as include-what-you-use for existing code.

Don't need scoped_ptr.h any more, though.

+#include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/app_list/app_list_export.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_model_observer.h"
 #include "ui/app_list/pagination_model_observer.h"
 #include "ui/base/models/list_model_observer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/controls/button/button.h"
@@ skipping 40 matching lines @@
                                      public AppListModelObserver,
                                      public ui::ImplicitAnimationObserver {
  public:
   enum Pointer {
     NONE,
     MOUSE,
     TOUCH,
   };
 
   // Constructs the app icon grid view. |delegate| is the delegate of this
-  // view, which usually is the hosting AppListView. |pagination_model| is
-  // the paging info shared within the launcher UI.
-  AppsGridView(AppsGridViewDelegate* delegate,
-               PaginationModel* pagination_model);
+  // view, which usually is the hosting AppListView.
+  AppsGridView(AppsGridViewDelegate* delegate);
   virtual ~AppsGridView();
 
   // Sets fixed layout parameters. After setting this, CalculateLayout below
   // is no longer called to dynamically choosing those layout params.
   void SetLayout(int icon_size, int cols, int rows_per_page);
 
   int cols() { return cols_; }
   int rows_per_page() { return rows_per_page_; }
 
   // This resets the grid view to a fresh state for showing the app list.
@@ skipping 37 matching lines @@
 
   // Prerenders the icons on and around |page_index|.
   void Prerender(int page_index);
 
   // Return true if the |bounds_animator_| is animating |view|.
   bool IsAnimatingView(views::View* view);
 
   bool has_dragged_view() const { return drag_view_ != NULL; }
   bool dragging() const { return drag_pointer_ != NONE; }
 
+  // Gets the PaginationModel used for the grid view.
+  PaginationModel* GetPaginationModel() const {

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

GetPaginationModel -> pagination_model and get rid of "const"

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

Done.

+    return pagination_model_.get();
+  }
+
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
   virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
   virtual bool GetDropFormats(
       int* formats,
       std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
@@ skipping 310 matching lines @@
                          const base::FilePath& path);
 #endif
 
   AppListModel* model_;  // Owned by AppListView.
   AppListItemList* item_list_;  // Not owned.
   AppsGridViewDelegate* delegate_;
 
   // This can be NULL. Only grid views inside folders have a folder delegate.
   AppsGridViewFolderDelegate* folder_delegate_;
 
-  PaginationModel* pagination_model_;  // Owned by AppListController.
+  scoped_ptr<PaginationModel> pagination_model_;

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

I'd consider trying this out as a non-pointer data member. Sure, it will expose
more stuff in the header, but that alone isn't typically a reason to use a
scoped_ptr member.

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

Done.

   PageSwitcher* page_switcher_view_;  // Owned by views hierarchy.
 
   gfx::Size icon_size_;
   int cols_;
   int rows_per_page_;
 
   // Tracks app item views. There is a view per item in |model_|.
   views::ViewModel view_model_;
 
   // Tracks pulsing block views.
@@ skipping 72 matching lines @@
 
   // True if the drag_view_ item is a folder item being dragged for reparenting.
   bool dragging_for_reparent_item_;
 
   DISALLOW_COPY_AND_ASSIGN(AppsGridView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_