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 #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 #include "ui/base/events/event.h" | 8 #include "ui/base/events/event.h" |
9 | 9 |
10 namespace aura { | 10 namespace aura { |
11 | 11 |
12 bool EventFilter::PreHandleKeyEvent(Window* target, ui::KeyEvent* event) { | 12 bool EventFilter::PreHandleKeyEvent(Window* target, ui::KeyEvent* event) { |
13 return false; | 13 return false; |
14 } | 14 } |
15 | 15 |
16 bool EventFilter::PreHandleMouseEvent(Window* target, ui::MouseEvent* event) { | 16 bool EventFilter::PreHandleMouseEvent(Window* target, ui::MouseEvent* event) { |
17 return false; | 17 return false; |
18 } | 18 } |
19 | 19 |
20 ui::TouchStatus EventFilter::PreHandleTouchEvent(Window* target, | 20 ui::EventResult EventFilter::PreHandleTouchEvent(Window* target, |
21 ui::TouchEvent* event) { | 21 ui::TouchEvent* event) { |
22 return ui::TOUCH_STATUS_UNKNOWN; | 22 return ui::ER_UNHANDLED; |
23 } | 23 } |
24 | 24 |
25 ui::EventResult EventFilter::PreHandleGestureEvent(Window* target, | 25 ui::EventResult EventFilter::PreHandleGestureEvent(Window* target, |
26 ui::GestureEvent* event) { | 26 ui::GestureEvent* event) { |
27 return ui::ER_UNHANDLED; | 27 return ui::ER_UNHANDLED; |
28 } | 28 } |
29 | 29 |
30 ui::EventResult EventFilter::OnKeyEvent(ui::KeyEvent* event) { | 30 ui::EventResult EventFilter::OnKeyEvent(ui::KeyEvent* event) { |
31 return PreHandleKeyEvent(static_cast<Window*>(event->target()), event) ? | 31 return PreHandleKeyEvent(static_cast<Window*>(event->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::MouseEvent* event) { | 35 ui::EventResult EventFilter::OnMouseEvent(ui::MouseEvent* event) { |
36 return PreHandleMouseEvent(static_cast<Window*>(event->target()), event) ? | 36 return PreHandleMouseEvent(static_cast<Window*>(event->target()), event) ? |
37 ui::ER_CONSUMED : ui::ER_UNHANDLED; | 37 ui::ER_CONSUMED : ui::ER_UNHANDLED; |
38 } | 38 } |
39 | 39 |
40 ui::EventResult EventFilter::OnScrollEvent(ui::ScrollEvent* event) { | 40 ui::EventResult EventFilter::OnScrollEvent(ui::ScrollEvent* event) { |
41 return ui::ER_UNHANDLED; | 41 return ui::ER_UNHANDLED; |
42 } | 42 } |
43 | 43 |
44 ui::EventResult EventFilter::OnTouchEvent(ui::TouchEvent* event) { | 44 ui::EventResult EventFilter::OnTouchEvent(ui::TouchEvent* event) { |
45 ui::TouchStatus status = PreHandleTouchEvent( | 45 return PreHandleTouchEvent(static_cast<Window*>(event->target()), event); |
46 static_cast<Window*>(event->target()), event); | |
47 return ui::EventResultFromTouchStatus(status); | |
48 } | 46 } |
49 | 47 |
50 ui::EventResult EventFilter::OnGestureEvent(ui::GestureEvent* event) { | 48 ui::EventResult EventFilter::OnGestureEvent(ui::GestureEvent* event) { |
51 return PreHandleGestureEvent(static_cast<Window*>(event->target()), event); | 49 return PreHandleGestureEvent(static_cast<Window*>(event->target()), event); |
52 } | 50 } |
53 | 51 |
54 } // namespace aura | 52 } // namespace aura |
OLD | NEW |