| Index: ui/app_list/contents_view.h
|
| ===================================================================
|
| --- ui/app_list/contents_view.h (revision 151481)
|
| +++ ui/app_list/contents_view.h (working copy)
|
| @@ -54,10 +54,10 @@
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| virtual ui::GestureStatus OnGestureEvent(
|
| - const views::GestureEvent& event) OVERRIDE;
|
| + const ui::GestureEvent& event) OVERRIDE;
|
| virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| - virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE;
|
| - virtual bool OnScrollEvent(const views::ScrollEvent & event) OVERRIDE;
|
| + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
|
| + virtual bool OnScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
|
|
|
| ShowState show_state_;
|
| PaginationModel* pagination_model_; // Owned by AppListController.
|
|
|