| Index: ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| index 1344b986f018e799244e55f46cb670b2a2d088b2..6b8040132709273f93de92cdeebdb0a837bedc7d 100644
|
| --- a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| +++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/message_loop/message_loop.h"
|
| #include "ui/events/event.h"
|
| +#include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
|
|
|
| namespace ui {
|
|
|
| @@ -19,12 +20,10 @@ TabletEventConverterEvdev::TabletEventConverterEvdev(
|
| InputDeviceType type,
|
| CursorDelegateEvdev* cursor,
|
| const EventDeviceInfo& info,
|
| - const MouseMoveEventDispatchCallback& mouse_move_callback,
|
| - const MouseButtonEventDispatchCallback& mouse_button_callback)
|
| + DeviceEventDispatcherEvdev* dispatcher)
|
| : EventConverterEvdev(fd, path, id, type),
|
| cursor_(cursor),
|
| - mouse_move_callback_(mouse_move_callback),
|
| - mouse_button_callback_(mouse_button_callback),
|
| + dispatcher_(dispatcher),
|
| stylus_(0),
|
| abs_value_dirty_(false) {
|
| x_abs_min_ = info.GetAbsMinimum(ABS_X);
|
| @@ -145,8 +144,8 @@ void TabletEventConverterEvdev::DispatchMouseButton(const input_event& input) {
|
|
|
| bool down = input.value;
|
|
|
| - mouse_button_callback_.Run(id_, cursor_->GetLocation(), button, down,
|
| - false /* allow_remap */);
|
| + dispatcher_->DispatchMouseButtonEvent(id_, cursor_->GetLocation(), button,
|
| + down, false /* allow_remap */);
|
| }
|
|
|
| void TabletEventConverterEvdev::FlushEvents() {
|
| @@ -164,7 +163,7 @@ void TabletEventConverterEvdev::FlushEvents() {
|
|
|
| UpdateCursor();
|
|
|
| - mouse_move_callback_.Run(id_, cursor_->GetLocation());
|
| + dispatcher_->DispatchMouseMoveEvent(id_, cursor_->GetLocation());
|
|
|
| abs_value_dirty_ = false;
|
| }
|
|
|