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

Side by Side Diff: ui/base/events/event_handler.cc

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « ui/base/events/event_handler.h ('k') | ui/base/events/event_target.h » ('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/base/events/event_handler.h" 5 #include "ui/base/events/event_handler.h"
6 6
7 #include "ui/base/events/event.h" 7 #include "ui/base/events/event.h"
8 8
9 namespace ui { 9 namespace ui {
10 10
11 EventHandler::EventHandler() { 11 EventHandler::EventHandler() {
12 } 12 }
13 13
14 EventHandler::~EventHandler() { 14 EventHandler::~EventHandler() {
15 } 15 }
16 16
17 void EventHandler::OnEvent(Event* event) { 17 void EventHandler::OnEvent(Event* event) {
18 ui::EventResult result = ui::ER_UNHANDLED; 18 ui::EventResult result = ui::ER_UNHANDLED;
19 if (event->IsKeyEvent()) 19 if (event->IsKeyEvent())
20 result = OnKeyEvent(static_cast<KeyEvent*>(event)); 20 result = OnKeyEvent(static_cast<KeyEvent*>(event));
21 else if (event->IsMouseEvent()) 21 else if (event->IsMouseEvent())
22 result = OnMouseEvent(static_cast<MouseEvent*>(event)); 22 result = OnMouseEvent(static_cast<MouseEvent*>(event));
23 else if (event->IsScrollEvent()) 23 else if (event->IsScrollEvent())
24 result = OnScrollEvent(static_cast<ScrollEvent*>(event)); 24 result = OnScrollEvent(static_cast<ScrollEvent*>(event));
25 else if (event->IsTouchEvent()) 25 else if (event->IsTouchEvent())
26 result = OnTouchEvent(static_cast<TouchEvent*>(event)); 26 result = OnTouchEvent(static_cast<TouchEvent*>(event));
27 else if (event->IsGestureEvent()) 27 else if (event->IsGestureEvent())
28 result = OnGestureEvent(static_cast<GestureEvent*>(event)); 28 OnGestureEvent(static_cast<GestureEvent*>(event));
29 29
30 if (result & ui::ER_CONSUMED) 30 if (result & ui::ER_CONSUMED)
31 event->StopPropagation(); 31 event->StopPropagation();
32 if (result & ui::ER_HANDLED) 32 if (result & ui::ER_HANDLED)
33 event->SetHandled(); 33 event->SetHandled();
34 } 34 }
35 35
36 EventResult EventHandler::OnKeyEvent(KeyEvent* event) { 36 EventResult EventHandler::OnKeyEvent(KeyEvent* event) {
37 return ui::ER_UNHANDLED; 37 return ui::ER_UNHANDLED;
38 } 38 }
39 39
40 EventResult EventHandler::OnMouseEvent(MouseEvent* event) { 40 EventResult EventHandler::OnMouseEvent(MouseEvent* event) {
41 return ui::ER_UNHANDLED; 41 return ui::ER_UNHANDLED;
42 } 42 }
43 43
44 EventResult EventHandler::OnScrollEvent(ScrollEvent* event) { 44 EventResult EventHandler::OnScrollEvent(ScrollEvent* event) {
45 return ui::ER_UNHANDLED; 45 return ui::ER_UNHANDLED;
46 } 46 }
47 47
48 EventResult EventHandler::OnTouchEvent(TouchEvent* event) { 48 EventResult EventHandler::OnTouchEvent(TouchEvent* event) {
49 return ui::ER_UNHANDLED; 49 return ui::ER_UNHANDLED;
50 } 50 }
51 51
52 EventResult EventHandler::OnGestureEvent(GestureEvent* event) { 52 void EventHandler::OnGestureEvent(GestureEvent* event) {
53 return ui::ER_UNHANDLED;
54 } 53 }
55 54
56 } // namespace ui 55 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/events/event_handler.h ('k') | ui/base/events/event_target.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698