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

Side by Side Diff: ui/aura/test/test_event_handler.cc

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit 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/window_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/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()
(...skipping 17 matching lines...) Expand all
28 ui::EventResult TestEventHandler::OnKeyEvent(ui::KeyEvent* event) { 28 ui::EventResult TestEventHandler::OnKeyEvent(ui::KeyEvent* event) {
29 num_key_events_++; 29 num_key_events_++;
30 return ui::ER_UNHANDLED; 30 return ui::ER_UNHANDLED;
31 } 31 }
32 32
33 ui::EventResult TestEventHandler::OnMouseEvent(ui::MouseEvent* event) { 33 ui::EventResult TestEventHandler::OnMouseEvent(ui::MouseEvent* event) {
34 num_mouse_events_++; 34 num_mouse_events_++;
35 return ui::ER_UNHANDLED; 35 return ui::ER_UNHANDLED;
36 } 36 }
37 37
38 ui::EventResult TestEventHandler::OnScrollEvent(ui::ScrollEvent* event) { 38 void TestEventHandler::OnScrollEvent(ui::ScrollEvent* event) {
39 num_scroll_events_++; 39 num_scroll_events_++;
40 return ui::ER_UNHANDLED;
41 } 40 }
42 41
43 ui::EventResult TestEventHandler::OnTouchEvent(ui::TouchEvent* event) { 42 void TestEventHandler::OnTouchEvent(ui::TouchEvent* event) {
44 num_touch_events_++; 43 num_touch_events_++;
45 return ui::ER_UNHANDLED;
46 } 44 }
47 45
48 void TestEventHandler::OnGestureEvent(ui::GestureEvent* event) { 46 void TestEventHandler::OnGestureEvent(ui::GestureEvent* event) {
49 num_gesture_events_++; 47 num_gesture_events_++;
50 } 48 }
51 49
52 } // namespace test 50 } // namespace test
53 } // namespace aura 51 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/test_event_handler.h ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698