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

Unified Diff: ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc

Issue 869613003: [PATCH 5/11] ozone: evdev: Replace dispatch callbacks with an interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: namespace ui Created 5 years, 11 months 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 side-by-side diff with in-line comments
Download patch
Index: ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
index a425c52cd280947f521bb24e55d5d67c00ee5953..387774f2116e41343788af38de5d646e71dc5752 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
@@ -24,21 +24,16 @@ const char kTestDevicePath[] = "/dev/input/test-device";
class MockEventConverterEvdevImpl : public EventConverterEvdevImpl {
public:
- MockEventConverterEvdevImpl(
- int fd,
- CursorDelegateEvdev* cursor,
- const KeyEventDispatchCallback& key_callback,
- const MouseMoveEventDispatchCallback& mouse_move_callback,
- const MouseButtonEventDispatchCallback& mouse_button_callback)
+ MockEventConverterEvdevImpl(int fd,
+ CursorDelegateEvdev* cursor,
+ DeviceEventDispatcherEvdev* dispatcher)
: EventConverterEvdevImpl(fd,
base::FilePath(kTestDevicePath),
1,
INPUT_DEVICE_UNKNOWN,
EventDeviceInfo(),
cursor,
- key_callback,
- mouse_move_callback,
- mouse_button_callback) {
+ dispatcher) {
Start();
}
~MockEventConverterEvdevImpl() override {}
@@ -130,14 +125,8 @@ class EventConverterEvdevImplTest : public testing::Test {
base::Bind(&EventConverterEvdevImplTest::DispatchEventForTest,
base::Unretained(this))));
- device_.reset(new ui::MockEventConverterEvdevImpl(
- events_in_, cursor_.get(),
- base::Bind(&ui::EventFactoryEvdev::PostKeyEvent,
- base::Unretained(event_factory_.get())),
- base::Bind(&ui::EventFactoryEvdev::PostMouseMoveEvent,
- base::Unretained(event_factory_.get())),
- base::Bind(&ui::EventFactoryEvdev::PostMouseButtonEvent,
- base::Unretained(event_factory_.get()))));
+ device_.reset(new ui::MockEventConverterEvdevImpl(events_in_, cursor_.get(),
+ event_factory_.get()));
}
void TearDown() override {
device_.reset();
« no previous file with comments | « ui/events/ozone/evdev/event_converter_evdev_impl.cc ('k') | ui/events/ozone/evdev/event_dispatch_callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698