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

Side by Side Diff: ui/aura/test/test_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/aura/test/test_event_handler.h ('k') | ui/aura/test/test_window_delegate.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/aura/test/test_event_handler.h" 5 #include "ui/aura/test/test_event_handler.h"
6 6
7 namespace aura { 7 namespace aura {
8 namespace test { 8 namespace test {
9 9
10 TestEventHandler::TestEventHandler() 10 TestEventHandler::TestEventHandler()
11 : num_key_events_(0), 11 : num_key_events_(0),
12 num_mouse_events_(0), 12 num_mouse_events_(0),
13 num_scroll_events_(0), 13 num_scroll_events_(0),
14 num_touch_events_(0), 14 num_touch_events_(0),
15 num_gesture_events_(0) { 15 num_gesture_events_(0) {
16 } 16 }
17 17
18 TestEventHandler::~TestEventHandler() {} 18 TestEventHandler::~TestEventHandler() {}
19 19
20 void TestEventHandler::Reset() { 20 void TestEventHandler::Reset() {
21 num_key_events_ = 0; 21 num_key_events_ = 0;
22 num_mouse_events_ = 0; 22 num_mouse_events_ = 0;
23 num_scroll_events_ = 0; 23 num_scroll_events_ = 0;
24 num_touch_events_ = 0; 24 num_touch_events_ = 0;
25 num_gesture_events_ = 0; 25 num_gesture_events_ = 0;
26 } 26 }
27 27
28 ui::EventResult TestEventHandler::OnKeyEvent(ui::KeyEvent* event) { 28 void TestEventHandler::OnKeyEvent(ui::KeyEvent* event) {
29 num_key_events_++; 29 num_key_events_++;
30 return ui::ER_UNHANDLED;
31 } 30 }
32 31
33 ui::EventResult TestEventHandler::OnMouseEvent(ui::MouseEvent* event) { 32 ui::EventResult TestEventHandler::OnMouseEvent(ui::MouseEvent* event) {
34 num_mouse_events_++; 33 num_mouse_events_++;
35 return ui::ER_UNHANDLED; 34 return ui::ER_UNHANDLED;
36 } 35 }
37 36
38 void TestEventHandler::OnScrollEvent(ui::ScrollEvent* event) { 37 void TestEventHandler::OnScrollEvent(ui::ScrollEvent* event) {
39 num_scroll_events_++; 38 num_scroll_events_++;
40 } 39 }
41 40
42 void TestEventHandler::OnTouchEvent(ui::TouchEvent* event) { 41 void TestEventHandler::OnTouchEvent(ui::TouchEvent* event) {
43 num_touch_events_++; 42 num_touch_events_++;
44 } 43 }
45 44
46 void TestEventHandler::OnGestureEvent(ui::GestureEvent* event) { 45 void TestEventHandler::OnGestureEvent(ui::GestureEvent* event) {
47 num_gesture_events_++; 46 num_gesture_events_++;
48 } 47 }
49 48
50 } // namespace test 49 } // namespace test
51 } // namespace aura 50 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/test_event_handler.h ('k') | ui/aura/test/test_window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698