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

Side by Side Diff: ui/base/events/event_dispatcher_unittest.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.cc ('k') | ui/base/events/event_handler.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 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 namespace ui { 9 namespace ui {
10 10
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 virtual EventResult OnScrollEvent(ScrollEvent* event) OVERRIDE { 93 virtual EventResult OnScrollEvent(ScrollEvent* event) OVERRIDE {
94 ReceivedEvent(event); 94 ReceivedEvent(event);
95 return event_result_; 95 return event_result_;
96 } 96 }
97 97
98 virtual EventResult OnTouchEvent(TouchEvent* event) OVERRIDE { 98 virtual EventResult OnTouchEvent(TouchEvent* event) OVERRIDE {
99 ReceivedEvent(event); 99 ReceivedEvent(event);
100 return event_result_; 100 return event_result_;
101 } 101 }
102 102
103 virtual EventResult OnGestureEvent(GestureEvent* event) OVERRIDE { 103 virtual void OnGestureEvent(GestureEvent* event) OVERRIDE {
104 ReceivedEvent(event); 104 ReceivedEvent(event);
105 return event_result_; 105 if (event_result_ & ui::ER_CONSUMED)
106 event->StopPropagation();
107 if (event_result_ & ui::ER_HANDLED)
108 event->SetHandled();
106 } 109 }
107 110
108 int id_; 111 int id_;
109 EventResult event_result_; 112 EventResult event_result_;
110 bool expect_pre_target_; 113 bool expect_pre_target_;
111 bool expect_post_target_; 114 bool expect_post_target_;
112 bool received_pre_target_; 115 bool received_pre_target_;
113 116
114 DISALLOW_COPY_AND_ASSIGN(TestEventHandler); 117 DISALLOW_COPY_AND_ASSIGN(TestEventHandler);
115 }; 118 };
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4), 0); 359 MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4), 0);
357 dispatcher.ProcessEvent(&target, &mouse); 360 dispatcher.ProcessEvent(&target, &mouse);
358 EXPECT_FALSE(target.valid()); 361 EXPECT_FALSE(target.valid());
359 EXPECT_TRUE(mouse.stopped_propagation()); 362 EXPECT_TRUE(mouse.stopped_propagation());
360 EXPECT_EQ(2U, target.handler_list().size()); 363 EXPECT_EQ(2U, target.handler_list().size());
361 EXPECT_EQ(1, target.handler_list()[0]); 364 EXPECT_EQ(1, target.handler_list()[0]);
362 EXPECT_EQ(2, target.handler_list()[1]); 365 EXPECT_EQ(2, target.handler_list()[1]);
363 } 366 }
364 367
365 } // namespace ui 368 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/events/event.cc ('k') | ui/base/events/event_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698