Refactor Udev device support in Ozone and add a DRM hotplug monitor

ui/events/ozone/evdev/event_factory_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/event_factory_evdev.h"
 
 #include <fcntl.h>
 #include <linux/input.h>
 
 #include "base/debug/trace_event.h"
 #include "base/stl_util.h"
 #include "base/task_runner.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/device_manager_evdev.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/key_event_converter_evdev.h"
 #include "ui/events/ozone/evdev/touch_event_converter_evdev.h"
 
-#if defined(USE_UDEV)
-#include "ui/events/ozone/evdev/device_manager_udev.h"
-#endif
-
 #if defined(USE_EVDEV_GESTURES)
 #include "ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h"
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h"
 #endif
 
 #ifndef EVIOCSCLOCKID
 #define EVIOCSCLOCKID  _IOW('E', 0xa0, int)
 #endif
 
 namespace ui {
@@ skipping 101 matching lines @@
 
 EventFactoryEvdev::EventFactoryEvdev()
     : ui_task_runner_(base::MessageLoopProxy::current()),
       file_task_runner_(base::MessageLoopProxy::current()),
       cursor_(NULL),
       dispatch_callback_(
           base::Bind(base::IgnoreResult(&EventFactoryEvdev::DispatchUiEvent),
                      base::Unretained(this))),
       weak_ptr_factory_(this) {}
 
-EventFactoryEvdev::EventFactoryEvdev(CursorDelegateEvdev* cursor)
-    : ui_task_runner_(base::MessageLoopProxy::current()),
+EventFactoryEvdev::EventFactoryEvdev(
+    CursorDelegateEvdev* cursor,
+    scoped_ptr<DeviceManagerEvdev> device_manager)
+    : device_manager_(device_manager.Pass()),
+      ui_task_runner_(base::MessageLoopProxy::current()),
       file_task_runner_(base::MessageLoopProxy::current()),
       cursor_(cursor),
       dispatch_callback_(
           base::Bind(base::IgnoreResult(&EventFactoryEvdev::DispatchUiEvent),
                      base::Unretained(this))),
       weak_ptr_factory_(this) {}
 
 EventFactoryEvdev::~EventFactoryEvdev() { STLDeleteValues(&converters_); }
 
 void EventFactoryEvdev::DispatchUiEvent(Event* event) {
@@ skipping 54 matching lines @@
 }
 
 void EventFactoryEvdev::OnDeviceRemoved(const base::FilePath& path) {
   TRACE_EVENT1("ozone", "OnDeviceRemoved", "path", path.value());
   DetachInputDevice(path);
 }
 
 void EventFactoryEvdev::StartProcessingEvents() {
   CHECK(ui_task_runner_->RunsTasksOnCurrentThread());
 
-#if defined(USE_UDEV)
-  // Scan for input devices using udev.
-  device_manager_ = CreateDeviceManagerUdev();
-#else
-  // No udev support. Scan devices manually in /dev/input.
-  device_manager_ = CreateDeviceManagerManual();
-#endif
-
-  // Scan & monitor devices.
-  device_manager_->ScanAndStartMonitoring(
-      base::Bind(&EventFactoryEvdev::OnDeviceAdded, base::Unretained(this)),
-      base::Bind(&EventFactoryEvdev::OnDeviceRemoved, base::Unretained(this)));
+  if (device_manager_) {
+    // Scan & monitor devices.
+    device_manager_->ScanAndStartMonitoring(
+        base::Bind(&EventFactoryEvdev::OnDeviceAdded, base::Unretained(this)),
+        base::Bind(&EventFactoryEvdev::OnDeviceRemoved,
+                   base::Unretained(this)));
+  }
 }
 
 void EventFactoryEvdev::SetFileTaskRunner(
     scoped_refptr<base::TaskRunner> task_runner) {
   file_task_runner_ = task_runner;
 }
 
 void EventFactoryEvdev::WarpCursorTo(gfx::AcceleratedWidget widget,
                                      const gfx::PointF& location) {
   if (cursor_) {
     cursor_->MoveCursorTo(widget, location);
     MouseEvent mouse_event(ET_MOUSE_MOVED,
                            cursor_->location(),
                            cursor_->location(),
                            modifiers_.GetModifierFlags(),
                            /* changed_button_flags */ 0);
     DispatchEvent(&mouse_event);
   }
 }
 
 }  // namespace ui