Extending the Views-on-Mac experiment: whole app list grid.

ui/app_list/cocoa/apps_grid_controller.h

Index: ui/app_list/cocoa/apps_grid_controller.h
diff --git a/ui/app_list/cocoa/apps_grid_controller.h b/ui/app_list/cocoa/apps_grid_controller.h
index e56533110a9c5cc1478ac0816b4e99473a945c84..62cd9ad7584c4f6ff48debee873517b1d662afdb 100644
--- a/ui/app_list/cocoa/apps_grid_controller.h
+++ b/ui/app_list/cocoa/apps_grid_controller.h
@@ -11,43 +11,29 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/app_list/app_list_export.h"
 #import "ui/app_list/cocoa/app_list_pager_view.h"
-#import "ui/app_list/cocoa/scroll_view_with_no_scrollbars.h"
+#include "ui/views_core/bridged_view_mac.h"
 
 namespace app_list {
 class AppListModel;
 class AppListViewDelegate;
-class AppsGridDelegateBridge;
+class AppsGridView;
+class AppsGridViewDelegateBridge;
+class PaginationModel;
 }
 
-@class AppsGridViewItem;
 @protocol AppsPaginationModelObserver;
-@class AppsCollectionViewDragManager;
 
 // Controls a grid of views, representing AppListItemList sub models.
 APP_LIST_EXPORT
-@interface AppsGridController : NSViewController<GestureScrollDelegate,
-                                                 AppListPagerDelegate,
-                                                 NSCollectionViewDelegate> {
+@interface AppsGridController : NSViewController<AppListPagerDelegate> {
  @private
   app_list::AppListViewDelegate* delegate_;  // Weak. Owned by view controller.
-  scoped_ptr<app_list::AppsGridDelegateBridge> bridge_;
 
-  base::scoped_nsobject<AppsCollectionViewDragManager> dragManager_;
-  base::scoped_nsobject<NSMutableArray> pages_;
-  base::scoped_nsobject<NSMutableArray> items_;
-  base::scoped_nsobject<NSTimer> scrollWhileDraggingTimer_;
+  scoped_ptr<app_list::AppsGridViewDelegateBridge> gridDelegate_;
+  scoped_ptr<app_list::PaginationModel> paginationModel_;
 
+  views::BridgedView<app_list::AppsGridView> gridView_;
   id<AppsPaginationModelObserver> paginationObserver_;
-
-  // Index of the currently visible page.
-  size_t visiblePage_;
-  // The page to which the view is currently animating a scroll.
-  size_t targetScrollPage_;
-  // The page to start scrolling to when the timer expires.
-  size_t scheduledScrollPage_;
-
-  // Whether we are currently animating a scroll to the nearest page.
-  BOOL animatingScroll_;
 }
 
 @property(assign, nonatomic) id<AppsPaginationModelObserver> paginationObserver;
@@ -61,8 +47,6 @@ APP_LIST_EXPORT
 - (NSCollectionView*)collectionViewAtPageIndex:(size_t)pageIndex;
 - (size_t)pageIndexForCollectionView:(NSCollectionView*)page;
 
-- (AppsGridViewItem*)itemAtIndex:(size_t)itemIndex;
-
 - (app_list::AppListModel*)model;
 
 - (void)setDelegate:(app_list::AppListViewDelegate*)newDelegate;
@@ -112,11 +96,4 @@ APP_LIST_EXPORT
 
 @end
 
-@interface AppsGridController(TestingAPI)
-
-- (AppsCollectionViewDragManager*)dragManager;
-- (size_t)scheduledScrollPage;
-
-@end
-
 #endif  // UI_APP_LIST_COCOA_APPS_GRID_CONTROLLER_H_