[PATCH 5/11] ozone: evdev: Replace dispatch callbacks with an interface

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 "ui/events/event.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/events/ozone/evdev/device_event_dispatcher_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,
     CursorDelegateEvdev* cursor,
-    const KeyEventDispatchCallback& key_callback,
-    const MouseMoveEventDispatchCallback& mouse_move_callback,
-    const MouseButtonEventDispatchCallback& mouse_button_callback)
+    DeviceEventDispatcherEvdev* dispatcher)
     : EventConverterEvdev(fd, path, id, type),
       has_keyboard_(devinfo.HasKeyboard()),
       has_touchpad_(devinfo.HasTouchpad()),
       x_offset_(0),
       y_offset_(0),
       cursor_(cursor),
-      key_callback_(key_callback),
-      mouse_move_callback_(mouse_move_callback),
-      mouse_button_callback_(mouse_button_callback) {
+      dispatcher_(dispatcher) {
 }
 
 EventConverterEvdevImpl::~EventConverterEvdevImpl() {
   Stop();
   close(fd_);
 }
 
 void EventConverterEvdevImpl::OnFileCanReadWithoutBlocking(int fd) {
   input_event inputs[4];
   ssize_t read_size = read(fd, inputs, sizeof(inputs));
@@ skipping 60 matching lines @@
   // Mouse processing.
   if (input.code >= BTN_MOUSE && input.code < BTN_JOYSTICK) {
     DispatchMouseButton(input);
     return;
   }
 
   // Keyboard processing.
   DomCode key_code = KeycodeConverter::NativeKeycodeToDomCode(
       EvdevCodeToNativeCode(input.code));
   if (!allowed_keys_ || allowed_keys_->count(key_code))
-    key_callback_.Run(id_, input.code, input.value != kKeyReleaseValue);
+    dispatcher_->DispatchKeyEvent(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:
       y_offset_ = input.value;
       break;
   }
 }
 
 void EventConverterEvdevImpl::DispatchMouseButton(const input_event& input) {
   if (!cursor_)
     return;
 
-  mouse_button_callback_.Run(id_, cursor_->GetLocation(), input.code,
-                             input.value, /* allow_remap */ true);
+  dispatcher_->DispatchMouseButtonEvent(id_, cursor_->GetLocation(), input.code,
+                                        input.value, /* allow_remap */ true);
 }
 
 void EventConverterEvdevImpl::FlushEvents() {
   if (!cursor_ || (x_offset_ == 0 && y_offset_ == 0))
     return;
 
   cursor_->MoveCursor(gfx::Vector2dF(x_offset_, y_offset_));
 
-  mouse_move_callback_.Run(id_, cursor_->GetLocation());
+  dispatcher_->DispatchMouseMoveEvent(id_, cursor_->GetLocation());
 
   x_offset_ = 0;
   y_offset_ = 0;
 }
 
 }  // namespace ui