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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h"
 
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
 #include <linux/input.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/timer/timer.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #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"
 #include "ui/gfx/geometry/point_f.h"
 
 namespace ui {
 
 namespace {
 
 // Convert libevdev device class to libgestures device class.
@@ skipping 73 matching lines @@
 // Number of fingers for swipe gestures.
 const int kGestureSwipeFingerCount = 3;
 
 }  // namespace
 
 GestureInterpreterLibevdevCros::GestureInterpreterLibevdevCros(
     int id,
     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),
       device_properties_(new GestureDeviceProperties) {
   memset(&prev_key_state_, 0, sizeof(prev_key_state_));
 }
 
 GestureInterpreterLibevdevCros::~GestureInterpreterLibevdevCros() {
   // Note that this destructor got called after the evdev device node has been
   // closed. Therefore, all clean-up codes here shouldn't depend on the device
@@ skipping 105 matching lines @@
 
 void GestureInterpreterLibevdevCros::SetAllowedKeys(
     scoped_ptr<std::set<DomCode>> allowed_keys) {
   if (!allowed_keys) {
     allowed_keys_.reset();
     return;
   }
 
   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);
   }
 }
 
 void GestureInterpreterLibevdevCros::AllowAllKeys() {
   allowed_keys_.reset();
 }
 
 void GestureInterpreterLibevdevCros::OnGestureReady(const Gesture* gesture) {
   switch (gesture->type) {
@@ skipping 241 matching lines @@
         continue;
 
       // Ignore digi buttons (e.g. BTN_TOOL_FINGER).
       if (key >= BTN_DIGI && key < BTN_WHEEL)
         continue;
 
       if (allowed_keys_ && !allowed_keys_->count(key))
         continue;
 
       // Dispatch key press or release to keyboard.
-      keyboard_->OnKeyChange(key, value);
+      key_callback_.Run(id_, key, value);
     }
   }
 
   // Update internal key state.
   for (unsigned long i = 0; i < EVDEV_BITS_TO_LONGS(KEY_CNT); ++i)
     prev_key_state_[i] = evdev->key_state_bitmask[i];
 }
 
 }  // namespace ui