Ozone support for device special cases in keyboard event rewriting.

ui/events/ozone/evdev/tablet_event_converter_evdev.cc

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 24b01fcf0ac0fcf20f994e84e9ab1f34d9600514..8f5c6005e2943ceab67439b5c0c90031f432fd13 100644
--- a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
@@ -145,8 +145,8 @@ void TabletEventConverterEvdev::DispatchMouseButton(const input_event& input) {
   bool down = input.value;
 
   dispatcher_->DispatchMouseButtonEvent(MouseButtonEventParams(
-      id_, cursor_->GetLocation(), button, down, false /* allow_remap */,
-      TimeDeltaFromInputEvent(input)));
+      input_device_.id, cursor_->GetLocation(), button, down,
+      false /* allow_remap */, TimeDeltaFromInputEvent(input)));
 }
 
 void TabletEventConverterEvdev::FlushEvents(const input_event& input) {
@@ -164,8 +164,9 @@ void TabletEventConverterEvdev::FlushEvents(const input_event& input) {
 
   UpdateCursor();
 
-  dispatcher_->DispatchMouseMoveEvent(MouseMoveEventParams(
-      id_, cursor_->GetLocation(), TimeDeltaFromInputEvent(input)));
+  dispatcher_->DispatchMouseMoveEvent(
+      MouseMoveEventParams(input_device_.id, cursor_->GetLocation(),
+                           TimeDeltaFromInputEvent(input)));
 
   abs_value_dirty_ = false;
 }