Ozone support for device special cases in keyboard event rewriting.

ui/events/ozone/evdev/event_converter_evdev_impl.cc

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 f6bb26687c8bb09642852fb21f4da93bec2c8a81..4a71b8d0b5708572a81ed6423c41a6acd845effc 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl.cc
@@ -178,7 +178,8 @@ void EventConverterEvdevImpl::OnKeyChange(unsigned int key,
   // State transition: !(down) -> (down)
   key_state_.set(key, down);
 
-  dispatcher_->DispatchKeyEvent(KeyEventParams(id_, key, down, timestamp));
+  dispatcher_->DispatchKeyEvent(
+      KeyEventParams(input_device_.id, key, down, timestamp));
 }
 
 void EventConverterEvdevImpl::ReleaseKeys() {
@@ -223,9 +224,9 @@ void EventConverterEvdevImpl::OnButtonChange(int code,
 
   mouse_button_state_.set(button_offset, down);
 
-  dispatcher_->DispatchMouseButtonEvent(
-      MouseButtonEventParams(id_, cursor_->GetLocation(), code, down,
-                             /* allow_remap */ true, timestamp));
+  dispatcher_->DispatchMouseButtonEvent(MouseButtonEventParams(
+      input_device_.id, cursor_->GetLocation(), code, down,
+      /* allow_remap */ true, timestamp));
 }
 
 void EventConverterEvdevImpl::FlushEvents(const input_event& input) {
@@ -234,8 +235,9 @@ void EventConverterEvdevImpl::FlushEvents(const input_event& input) {
 
   cursor_->MoveCursor(gfx::Vector2dF(x_offset_, y_offset_));
 
-  dispatcher_->DispatchMouseMoveEvent(MouseMoveEventParams(
-      id_, cursor_->GetLocation(), TimeDeltaFromInputEvent(input)));
+  dispatcher_->DispatchMouseMoveEvent(
+      MouseMoveEventParams(input_device_.id, cursor_->GetLocation(),
+                           TimeDeltaFromInputEvent(input)));
 
   x_offset_ = 0;
   y_offset_ = 0;