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

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

Issue 11570012: events: Update key-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-for-landing 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_dispatcher.h" 5 #include "ui/base/events/event_dispatcher.h"
6 #include "ui/base/events/event_handler.h" 6 #include "ui/base/events/event_handler.h"
7 7
8 #include "ui/base/events/event.h" 8 #include "ui/base/events/event.h"
9 9
10 namespace ui { 10 namespace ui {
11 11
12 EventHandler::EventHandler() { 12 EventHandler::EventHandler() {
13 } 13 }
14 14
15 EventHandler::~EventHandler() { 15 EventHandler::~EventHandler() {
16 while (!dispatchers_.empty()) { 16 while (!dispatchers_.empty()) {
17 EventDispatcher* dispatcher = dispatchers_.top(); 17 EventDispatcher* dispatcher = dispatchers_.top();
18 dispatchers_.pop(); 18 dispatchers_.pop();
19 dispatcher->OnHandlerDestroyed(this); 19 dispatcher->OnHandlerDestroyed(this);
20 } 20 }
21 } 21 }
22 22
23 void EventHandler::OnEvent(Event* event) { 23 void EventHandler::OnEvent(Event* event) {
24 ui::EventResult result = ui::ER_UNHANDLED; 24 ui::EventResult result = ui::ER_UNHANDLED;
25 if (event->IsKeyEvent()) 25 if (event->IsKeyEvent())
26 result = OnKeyEvent(static_cast<KeyEvent*>(event)); 26 OnKeyEvent(static_cast<KeyEvent*>(event));
27 else if (event->IsMouseEvent()) 27 else if (event->IsMouseEvent())
28 result = OnMouseEvent(static_cast<MouseEvent*>(event)); 28 result = OnMouseEvent(static_cast<MouseEvent*>(event));
29 else if (event->IsScrollEvent()) 29 else if (event->IsScrollEvent())
30 OnScrollEvent(static_cast<ScrollEvent*>(event)); 30 OnScrollEvent(static_cast<ScrollEvent*>(event));
31 else if (event->IsTouchEvent()) 31 else if (event->IsTouchEvent())
32 OnTouchEvent(static_cast<TouchEvent*>(event)); 32 OnTouchEvent(static_cast<TouchEvent*>(event));
33 else if (event->IsGestureEvent()) 33 else if (event->IsGestureEvent())
34 OnGestureEvent(static_cast<GestureEvent*>(event)); 34 OnGestureEvent(static_cast<GestureEvent*>(event));
35 35
36 if (result & ui::ER_CONSUMED) 36 if (result & ui::ER_CONSUMED)
37 event->StopPropagation(); 37 event->StopPropagation();
38 if (result & ui::ER_HANDLED) 38 if (result & ui::ER_HANDLED)
39 event->SetHandled(); 39 event->SetHandled();
40 } 40 }
41 41
42 EventResult EventHandler::OnKeyEvent(KeyEvent* event) { 42 void EventHandler::OnKeyEvent(KeyEvent* event) {
43 return ui::ER_UNHANDLED;
44 } 43 }
45 44
46 EventResult EventHandler::OnMouseEvent(MouseEvent* event) { 45 EventResult EventHandler::OnMouseEvent(MouseEvent* event) {
47 return ui::ER_UNHANDLED; 46 return ui::ER_UNHANDLED;
48 } 47 }
49 48
50 void EventHandler::OnScrollEvent(ScrollEvent* event) { 49 void EventHandler::OnScrollEvent(ScrollEvent* event) {
51 } 50 }
52 51
53 void EventHandler::OnTouchEvent(TouchEvent* event) { 52 void EventHandler::OnTouchEvent(TouchEvent* event) {
54 } 53 }
55 54
56 void EventHandler::OnGestureEvent(GestureEvent* event) { 55 void EventHandler::OnGestureEvent(GestureEvent* event) {
57 } 56 }
58 57
59 } // namespace ui 58 } // 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