ozone: evdev: Factor keyboard into KeyboardEvdev

ui/events/ozone/evdev/event_factory_evdev.h

Index: ui/events/ozone/evdev/event_factory_evdev.h
diff --git a/ui/events/ozone/evdev/event_factory_evdev.h b/ui/events/ozone/evdev/event_factory_evdev.h
index 806ec2955998b1f42d1548609f72c40465396b11..c1998a612a52fdd9abc1a5fc6cc700f54e2a563b 100644
--- a/ui/events/ozone/evdev/event_factory_evdev.h
+++ b/ui/events/ozone/evdev/event_factory_evdev.h
@@ -14,6 +14,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"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -70,15 +71,18 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
   // Task runner for event dispatch.
   scoped_refptr<base::TaskRunner> ui_task_runner_;
 
+  // Dispatch callback for events.
+  EventDispatchCallback dispatch_callback_;
+
   // Modifier key state (shift, ctrl, etc).
   EventModifiersEvdev modifiers_;
 
+  // Keyboard state.
+  KeyboardEvdev keyboard_;
+
   // Cursor movement.
   CursorDelegateEvdev* cursor_;
 
-  // Dispatch callback for events.
-  EventDispatchCallback dispatch_callback_;
-
   // Support weak pointers for attach & detach callbacks.
   base::WeakPtrFactory<EventFactoryEvdev> weak_ptr_factory_;