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

ui/events/ozone/evdev/event_converter_evdev_impl.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/event_converter_evdev_impl.h"
 
 #include <errno.h>
 #include <linux/input.h>
 
-#include "base/message_loop/message_loop.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
-#include "ui/events/ozone/evdev/keyboard_evdev.h"
+#include "ui/events/ozone/evdev/keyboard_util_evdev.h"
 
 namespace ui {
 
+namespace {
+
 // Values for EV_KEY.
 const int kKeyReleaseValue = 0;
 const int kKeyRepeatValue = 2;
 
+}  // namespace
+
 EventConverterEvdevImpl::EventConverterEvdevImpl(
     int fd,
     base::FilePath path,
     int id,
     InputDeviceType type,
     const EventDeviceInfo& devinfo,
     EventModifiersEvdev* modifiers,
     MouseButtonMapEvdev* button_map,
     CursorDelegateEvdev* cursor,
-    KeyboardEvdev* keyboard,
+    const KeyEventDispatchCallback& key_callback,
     const EventDispatchCallback& callback)
     : EventConverterEvdev(fd, path, id, type),
       has_keyboard_(devinfo.HasKeyboard()),
       has_touchpad_(devinfo.HasTouchpad()),
       x_offset_(0),
       y_offset_(0),
       cursor_(cursor),
-      keyboard_(keyboard),
       modifiers_(modifiers),
       button_map_(button_map),
+      key_callback_(key_callback),
       callback_(callback) {
 }
 
 EventConverterEvdevImpl::~EventConverterEvdevImpl() {
   Stop();
   close(fd_);
 }
 
 void EventConverterEvdevImpl::OnFileCanReadWithoutBlocking(int fd) {
   input_event inputs[4];
@@ skipping 59 matching lines @@
     return;
 
   // Mouse processing.
   if (input.code >= BTN_MOUSE && input.code < BTN_JOYSTICK) {
     DispatchMouseButton(input);
     return;
   }
 
   // Keyboard processing.
   DomCode key_code = KeycodeConverter::NativeKeycodeToDomCode(
-      KeyboardEvdev::EvdevCodeToNativeCode(input.code));
+      EvdevCodeToNativeCode(input.code));
   if (!allowed_keys_ || allowed_keys_->count(key_code))
-    keyboard_->OnKeyChange(input.code, input.value != kKeyReleaseValue);
+    key_callback_.Run(id_, input.code, input.value != kKeyReleaseValue);
 }
 
 void EventConverterEvdevImpl::ConvertMouseMoveEvent(const input_event& input) {
   if (!cursor_)
     return;
   switch (input.code) {
     case REL_X:
       x_offset_ = input.value;
       break;
     case REL_Y:
@@ skipping 37 matching lines @@
       new MouseEvent(ui::ET_MOUSE_MOVED,
                      cursor_->GetLocation(),
                      cursor_->GetLocation(),
                      modifiers_->GetModifierFlags(),
                      /* changed_button_flags */ 0)));
   x_offset_ = 0;
   y_offset_ = 0;
 }
 
 }  // namespace ui