Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Side by Side Diff: ui/app_list/contents_view.h

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/app_list/apps_grid_view.cc ('k') | ui/app_list/contents_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_APP_LIST_CONTENTS_VIEW_H_ 5 #ifndef UI_APP_LIST_CONTENTS_VIEW_H_
6 #define UI_APP_LIST_CONTENTS_VIEW_H_ 6 #define UI_APP_LIST_CONTENTS_VIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 void ShowStateChanged(); 48 void ShowStateChanged();
49 49
50 void CalculateIdealBounds(); 50 void CalculateIdealBounds();
51 void AnimateToIdealBounds(); 51 void AnimateToIdealBounds();
52 52
53 // Overridden from views::View: 53 // Overridden from views::View:
54 virtual gfx::Size GetPreferredSize() OVERRIDE; 54 virtual gfx::Size GetPreferredSize() OVERRIDE;
55 virtual void Layout() OVERRIDE; 55 virtual void Layout() OVERRIDE;
56 virtual ui::GestureStatus OnGestureEvent( 56 virtual ui::GestureStatus OnGestureEvent(
57 const views::GestureEvent& event) OVERRIDE; 57 const views::GestureEvent& event) OVERRIDE;
58 virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE; 58 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
59 virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE; 59 virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE;
60 virtual bool OnScrollEvent(const views::ScrollEvent & event) OVERRIDE; 60 virtual bool OnScrollEvent(const views::ScrollEvent & event) OVERRIDE;
61 61
62 ShowState show_state_; 62 ShowState show_state_;
63 PaginationModel* pagination_model_; // Owned by AppListController. 63 PaginationModel* pagination_model_; // Owned by AppListController.
64 64
65 scoped_ptr<views::ViewModel> view_model_; 65 scoped_ptr<views::ViewModel> view_model_;
66 scoped_ptr<views::BoundsAnimator> bounds_animator_; 66 scoped_ptr<views::BoundsAnimator> bounds_animator_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(ContentsView); 68 DISALLOW_COPY_AND_ASSIGN(ContentsView);
69 }; 69 };
70 70
71 } // namespace app_list 71 } // namespace app_list
72 72
73 #endif // UI_APP_LIST_CONTENTS_VIEW_H_ 73 #endif // UI_APP_LIST_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/apps_grid_view.cc ('k') | ui/app_list/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698