ozone: evdev: Factor keyboard into KeyboardEvdev

ui/events/ozone/evdev/key_event_converter_evdev.h

Index: ui/events/ozone/evdev/key_event_converter_evdev.h
diff --git a/ui/events/ozone/evdev/key_event_converter_evdev.h b/ui/events/ozone/evdev/key_event_converter_evdev.h
index 9a2f77191caf6cb9c5d5f961d70dc02e2f07a65a..f1044fafd3b3ff33244ebc92744d363648b68982 100644
--- a/ui/events/ozone/evdev/key_event_converter_evdev.h
+++ b/ui/events/ozone/evdev/key_event_converter_evdev.h
@@ -11,6 +11,7 @@
 #include "ui/events/ozone/evdev/event_converter_evdev.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
+#include "ui/events/ozone/evdev/keyboard_evdev.h"
 
 struct input_event;
 
@@ -22,8 +23,7 @@ class EVENTS_OZONE_EVDEV_EXPORT KeyEventConverterEvdev
   KeyEventConverterEvdev(int fd,
                          base::FilePath path,
                          int id,
-                         EventModifiersEvdev* modifiers,
-                         const EventDispatchCallback& dispatch);
+                         KeyboardEvdev* keyboard);
   virtual ~KeyEventConverterEvdev();
 
   // EventConverterEvdev:
@@ -32,16 +32,11 @@ class EVENTS_OZONE_EVDEV_EXPORT KeyEventConverterEvdev
   void ProcessEvents(const struct input_event* inputs, int count);
 
  private:
-  // Callback for dispatching events.
-  EventDispatchCallback callback_;
-
-  // Shared modifier state.
-  EventModifiersEvdev* modifiers_;
-
   // Controller for watching the input fd.
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
 
-  void ConvertKeyEvent(int key, int value);
+  // Shared keyboard state.
+  KeyboardEvdev* keyboard_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyEventConverterEvdev);
 };