ui/app_list/contents_view.h - Issue 11568006: events: Update scroll and touch handlers to not return EventResult.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: self-nit Created 8 years 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 | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | ui/app_list/contents_view.cc » ('j') | no next file with comments »

OLD	NEW
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 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;	56 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;

57 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;	57 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;

58	58

59 // Overridden from ui::EventHandler:	59 // Overridden from ui::EventHandler:

60 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;	60 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;

61 virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;	61 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;

62	62

63 ShowState show_state_;	63 ShowState show_state_;

64 PaginationModel* pagination_model_; // Owned by AppListController.	64 PaginationModel* pagination_model_; // Owned by AppListController.

65	65

66 scoped_ptr<views::ViewModel> view_model_;	66 scoped_ptr<views::ViewModel> view_model_;

67 scoped_ptr<views::BoundsAnimator> bounds_animator_;	67 scoped_ptr<views::BoundsAnimator> bounds_animator_;

68	68

69 DISALLOW_COPY_AND_ASSIGN(ContentsView);	69 DISALLOW_COPY_AND_ASSIGN(ContentsView);

70 };	70 };

71	71

72 } // namespace app_list	72 } // namespace app_list

73	73

74 #endif // UI_APP_LIST_CONTENTS_VIEW_H_	74 #endif // UI_APP_LIST_CONTENTS_VIEW_H_

OLD	NEW