Chromium Code Reviews| Index: ui/app_list/views/apps_container_view.h |
| diff --git a/ui/app_list/views/apps_container_view.h b/ui/app_list/views/apps_container_view.h |
| index 3278385fdbda56a2d40d2a683bd569bbc4e733c7..1988a98b4d3ab4038265504e36c6cdf43caeccdd 100644 |
| --- a/ui/app_list/views/apps_container_view.h |
| +++ b/ui/app_list/views/apps_container_view.h |
| @@ -21,6 +21,7 @@ class AppListMainView; |
| class AppListModel; |
| class ContentsView; |
| class FolderBackgroundView; |
| +class PaginationModel; |
| // AppsContainerView contains a root level AppsGridView to render the root level |
| // app items, and a AppListFolderView to render the app items inside the |
| @@ -61,6 +62,11 @@ class AppsContainerView : public views::View, |
| virtual gfx::Size GetPreferredSize() const OVERRIDE; |
| virtual void Layout() OVERRIDE; |
| virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; |
| + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; |
| + |
| + // Overridden from ui::EventHandler: |
| + virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; |
| + virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; |
|
calamity
2014/08/26 08:12:34
Should this be part of the AppsGridView instead?
Matt Giuca
2014/08/28 00:35:21
Done.
|
| // TopIconAnimationObserver overrides: |
| virtual void OnTopIconAnimationsComplete() OVERRIDE; |
| @@ -87,6 +93,9 @@ class AppsContainerView : public views::View, |
| // bottom left, bottom right. |
| Rects GetTopItemIconBoundsInActiveFolder(); |
| + // Gets the PaginationModel owned by the AppsGridView. |
| + PaginationModel* GetPaginationModel(); |
| + |
| // Creates the transitional views for animating the top items in the folder |
| // when opening or closing a folder. |
| void CreateViewsForFolderTopItemsAnimation( |