[PATCH 4/11] ozone: evdev: Move EventModifiersEvdev usage to EventFactoryEvdev

ui/events/ozone/evdev/tablet_event_converter_evdev.h

Index: ui/events/ozone/evdev/tablet_event_converter_evdev.h
diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev.h b/ui/events/ozone/evdev/tablet_event_converter_evdev.h
index fa03e12562a6333e03fac67c1c94c06fcf98157b..6d386bbef4ad804903aff5ff884ad42859f1fa3b 100644
--- a/ui/events/ozone/evdev/tablet_event_converter_evdev.h
+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.h
@@ -21,14 +21,15 @@ namespace ui {
 class EVENTS_OZONE_EVDEV_EXPORT TabletEventConverterEvdev
     : public EventConverterEvdev {
  public:
-  TabletEventConverterEvdev(int fd,
-                            base::FilePath path,
-                            int id,
-                            InputDeviceType type,
-                            EventModifiersEvdev* modifiers,
-                            CursorDelegateEvdev* cursor,
-                            const EventDeviceInfo& info,
-                            const EventDispatchCallback& callback);
+  TabletEventConverterEvdev(
+      int fd,
+      base::FilePath path,
+      int id,
+      InputDeviceType type,
+      CursorDelegateEvdev* cursor,
+      const EventDeviceInfo& info,
+      const MouseMoveEventDispatchCallback& mouse_move_callback,
+      const MouseButtonEventDispatchCallback& mouse_button_callback);
   ~TabletEventConverterEvdev() override;
 
   // EventConverterEvdev:
@@ -53,11 +54,9 @@ class EVENTS_OZONE_EVDEV_EXPORT TabletEventConverterEvdev
   // Shared cursor state.
   CursorDelegateEvdev* cursor_;
 
-  // Modifier key state (shift, ctrl, etc).
-  EventModifiersEvdev* modifiers_;
-
-  // Callback for dispatching events.
-  EventDispatchCallback callback_;
+  // Callbacks for dispatching events.
+  MouseMoveEventDispatchCallback mouse_move_callback_;
+  MouseButtonEventDispatchCallback mouse_button_callback_;
 
   int y_abs_location_;
   int x_abs_location_;