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

Side by Side Diff: ui/aura/event_filter.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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/aura/event_filter.h ('k') | ui/aura/event_filter_unittest.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 #include "ui/aura/event_filter.h" 5 #include "ui/aura/event_filter.h"
6 6
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 8
9 namespace aura { 9 namespace aura {
10 10
11 bool EventFilter::PreHandleKeyEvent(Window* target, ui::KeyEvent* event) { 11 bool EventFilter::PreHandleKeyEvent(Window* target, ui::KeyEvent* event) {
12 return false; 12 return false;
13 } 13 }
14 14
15 bool EventFilter::PreHandleMouseEvent(Window* target, ui::MouseEvent* event) { 15 bool EventFilter::PreHandleMouseEvent(Window* target, ui::MouseEvent* event) {
16 return false; 16 return false;
17 } 17 }
18 18
19 ui::TouchStatus EventFilter::PreHandleTouchEvent(Window* target, 19 ui::TouchStatus EventFilter::PreHandleTouchEvent(Window* target,
20 ui::TouchEvent* event) { 20 ui::TouchEvent* event) {
21 return ui::TOUCH_STATUS_UNKNOWN; 21 return ui::TOUCH_STATUS_UNKNOWN;
22 } 22 }
23 23
24 ui::GestureStatus EventFilter::PreHandleGestureEvent(Window* target, 24 ui::EventResult EventFilter::PreHandleGestureEvent(Window* target,
25 ui::GestureEvent* event) { 25 ui::GestureEvent* event) {
26 return ui::GESTURE_STATUS_UNKNOWN; 26 return ui::ER_UNHANDLED;
27 } 27 }
28 28
29 ui::EventResult EventFilter::OnKeyEvent(ui::EventTarget* target, 29 ui::EventResult EventFilter::OnKeyEvent(ui::EventTarget* target,
30 ui::KeyEvent* event) { 30 ui::KeyEvent* event) {
31 return PreHandleKeyEvent(static_cast<Window*>(target), event) ? 31 return PreHandleKeyEvent(static_cast<Window*>(target), event) ?
32 ui::ER_CONSUMED : ui::ER_UNHANDLED; 32 ui::ER_CONSUMED : ui::ER_UNHANDLED;
33 } 33 }
34 34
35 ui::EventResult EventFilter::OnMouseEvent(ui::EventTarget* target, 35 ui::EventResult EventFilter::OnMouseEvent(ui::EventTarget* target,
36 ui::MouseEvent* event) { 36 ui::MouseEvent* event) {
37 return PreHandleMouseEvent(static_cast<Window*>(target), event) ? 37 return PreHandleMouseEvent(static_cast<Window*>(target), event) ?
38 ui::ER_CONSUMED : ui::ER_UNHANDLED; 38 ui::ER_CONSUMED : ui::ER_UNHANDLED;
39 } 39 }
40 40
41 ui::EventResult EventFilter::OnScrollEvent(ui::EventTarget* target, 41 ui::EventResult EventFilter::OnScrollEvent(ui::EventTarget* target,
42 ui::ScrollEvent* event) { 42 ui::ScrollEvent* event) {
43 return ui::ER_UNHANDLED; 43 return ui::ER_UNHANDLED;
44 } 44 }
45 45
46 ui::TouchStatus EventFilter::OnTouchEvent(ui::EventTarget* target, 46 ui::TouchStatus EventFilter::OnTouchEvent(ui::EventTarget* target,
47 ui::TouchEvent* event) { 47 ui::TouchEvent* event) {
48 return PreHandleTouchEvent(static_cast<Window*>(target), event); 48 return PreHandleTouchEvent(static_cast<Window*>(target), event);
49 } 49 }
50 50
51 ui::EventResult EventFilter::OnGestureEvent(ui::EventTarget* target, 51 ui::EventResult EventFilter::OnGestureEvent(ui::EventTarget* target,
52 ui::GestureEvent* event) { 52 ui::GestureEvent* event) {
53 return PreHandleGestureEvent(static_cast<Window*>(target), event) == 53 return PreHandleGestureEvent(static_cast<Window*>(target), event);
54 ui::GESTURE_STATUS_CONSUMED ? ui::ER_CONSUMED : ui::ER_UNHANDLED;
55 } 54 }
56 55
57 } // namespace aura 56 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/event_filter.h ('k') | ui/aura/event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698