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

ui/events/ozone/evdev/touch_event_converter_evdev.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/touch_event_converter_evdev.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <poll.h>
@@ skipping 10 matching lines @@
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/device_util_linux.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_switches.h"
+#include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
 
 namespace {
 
 struct TouchCalibration {
   int bezel_left;
   int bezel_right;
   int bezel_top;
   int bezel_bottom;
 };
 
@@ skipping 26 matching lines @@
       radius_x_(0),
       radius_y_(0),
       pressure_(0) {
 }
 
 TouchEventConverterEvdev::TouchEventConverterEvdev(
     int fd,
     base::FilePath path,
     int id,
     InputDeviceType type,
-    const TouchEventDispatchCallback& touch_callback)
+    DeviceEventDispatcherEvdev* dispatcher)
     : EventConverterEvdev(fd, path, id, type),
-      touch_callback_(touch_callback),
+      dispatcher_(dispatcher),
       syn_dropped_(false),
       is_type_a_(false),
       current_slot_(0) {
 }
 
 TouchEventConverterEvdev::~TouchEventConverterEvdev() {
   Stop();
   close(fd_);
 }
 
@@ skipping 175 matching lines @@
       syn_dropped_ = true;
       break;
     default:
       NOTIMPLEMENTED() << "invalid code for EV_SYN: " << input.code;
   }
 }
 
 void TouchEventConverterEvdev::ReportEvent(int touch_id,
                                            const InProgressEvents& event,
                                            const base::TimeDelta& timestamp) {
-  touch_callback_.Run(TouchEventParams(
+  dispatcher_->DispatchTouchEvent(TouchEventParams(
       id_, touch_id, event.type_, gfx::PointF(event.x_, event.y_),
       gfx::Vector2dF(event.radius_x_, event.radius_y_), event.pressure_,
       timestamp));
 }
 
 void TouchEventConverterEvdev::ReportEvents(base::TimeDelta delta) {
   for (int i = 0; i < MAX_FINGERS; i++) {
     if (altered_slots_[i]) {
       ReportEvent(i, events_[i], delta);
 
       // Subsequent events for this finger will be touch-move until it
       // is released.
       events_[i].type_ = ET_TOUCH_MOVED;
     }
   }
   altered_slots_.reset();
 }
 
 }  // namespace ui