[PATCH 2/11] ozone: evdev: Move KeyboardEvdev usage during dispatch to EventFactoryEvdev

ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc

Index: ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
index c338c5ba0450d3a97306bc8047294b3e32f524ac..8d0ed503126954e0b12f7d999c49a53869acad14 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
@@ -16,7 +16,7 @@
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/event_device_util.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
-#include "ui/events/ozone/evdev/keyboard_evdev.h"
+#include "ui/events/ozone/evdev/keyboard_util_evdev.h"
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h"
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_timer_provider.h"
 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
@@ -110,16 +110,16 @@ GestureInterpreterLibevdevCros::GestureInterpreterLibevdevCros(
     EventModifiersEvdev* modifiers,
     MouseButtonMapEvdev* button_map,
     CursorDelegateEvdev* cursor,
-    KeyboardEvdev* keyboard,
     GesturePropertyProvider* property_provider,
+    const KeyEventDispatchCallback& key_callback,
     const EventDispatchCallback& callback)
     : id_(id),
       is_mouse_(false),
       modifiers_(modifiers),
       button_map_(button_map),
       cursor_(cursor),
-      keyboard_(keyboard),
       property_provider_(property_provider),
+      key_callback_(key_callback),
       dispatch_callback_(callback),
       interpreter_(NULL),
       evdev_(NULL),
@@ -245,8 +245,8 @@ void GestureInterpreterLibevdevCros::SetAllowedKeys(
 
   allowed_keys_.reset(new std::set<int>());
   for (const auto& it : *allowed_keys) {
-    int evdev_code = KeyboardEvdev::NativeCodeToEvdevCode(
-        KeycodeConverter::DomCodeToNativeKeycode(it));
+    int evdev_code =
+        NativeCodeToEvdevCode(KeycodeConverter::DomCodeToNativeKeycode(it));
     allowed_keys_->insert(evdev_code);
   }
 }
@@ -508,7 +508,7 @@ void GestureInterpreterLibevdevCros::DispatchChangedKeys(Evdev* evdev,
         continue;
 
       // Dispatch key press or release to keyboard.
-      keyboard_->OnKeyChange(key, value);
+      key_callback_.Run(KeyEventParams(id_, key, value));
     }
   }