Index: ui/events/ozone/evdev/event_converter_evdev_impl.cc |
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl.cc b/ui/events/ozone/evdev/event_converter_evdev_impl.cc |
index 0e7c7f1396305fd69943ab63c6731689c0eed1dc..f6bb26687c8bb09642852fb21f4da93bec2c8a81 100644 |
--- a/ui/events/ozone/evdev/event_converter_evdev_impl.cc |
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl.cc |
@@ -31,13 +31,7 @@ |
const EventDeviceInfo& devinfo, |
CursorDelegateEvdev* cursor, |
DeviceEventDispatcherEvdev* dispatcher) |
- : EventConverterEvdev(fd, |
- path, |
- id, |
- type, |
- devinfo.name(), |
- devinfo.vendor_id(), |
- devinfo.product_id()), |
+ : EventConverterEvdev(fd, path, id, type), |
has_keyboard_(devinfo.HasKeyboard()), |
has_touchpad_(devinfo.HasTouchpad()), |
has_caps_lock_led_(devinfo.HasLedEvent(LED_CAPSL)), |
@@ -184,8 +178,7 @@ |
// State transition: !(down) -> (down) |
key_state_.set(key, down); |
- dispatcher_->DispatchKeyEvent( |
- KeyEventParams(input_device_.id, key, down, timestamp)); |
+ dispatcher_->DispatchKeyEvent(KeyEventParams(id_, key, down, timestamp)); |
} |
void EventConverterEvdevImpl::ReleaseKeys() { |
@@ -230,9 +223,9 @@ |
mouse_button_state_.set(button_offset, down); |
- dispatcher_->DispatchMouseButtonEvent(MouseButtonEventParams( |
- input_device_.id, cursor_->GetLocation(), code, down, |
- /* allow_remap */ true, timestamp)); |
+ dispatcher_->DispatchMouseButtonEvent( |
+ MouseButtonEventParams(id_, cursor_->GetLocation(), code, down, |
+ /* allow_remap */ true, timestamp)); |
} |
void EventConverterEvdevImpl::FlushEvents(const input_event& input) { |
@@ -241,9 +234,8 @@ |
cursor_->MoveCursor(gfx::Vector2dF(x_offset_, y_offset_)); |
- dispatcher_->DispatchMouseMoveEvent( |
- MouseMoveEventParams(input_device_.id, cursor_->GetLocation(), |
- TimeDeltaFromInputEvent(input))); |
+ dispatcher_->DispatchMouseMoveEvent(MouseMoveEventParams( |
+ id_, cursor_->GetLocation(), TimeDeltaFromInputEvent(input))); |
x_offset_ = 0; |
y_offset_ = 0; |