[PATCH 6/11] ozone: evdev: Factor device I/O out of EventFactoryOzone

ui/events/ozone/evdev/input_controller_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/input_controller_evdev.h"
 
 #include <algorithm>
 #include <linux/input.h>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
-#include "ui/events/ozone/evdev/event_factory_evdev.h"
+#include "ui/events/ozone/evdev/input_device_factory_evdev.h"
+#include "ui/events/ozone/evdev/keyboard_evdev.h"
 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
 
 #if defined(USE_EVDEV_GESTURES)
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h"
 #endif
 
 namespace ui {
 
 namespace {
 
@@ skipping 52 matching lines @@
       return DumpArrayProperty(property->GetDoubleValue(), "%lf");
       break;
     default:
       NOTREACHED();
       break;
   }
   return std::string();
 }
 
 // Dump touch device property values to a string.
-void DumpTouchDeviceStatus(EventFactoryEvdev* event_factory,
+void DumpTouchDeviceStatus(InputDeviceFactoryEvdev* event_factory,
                            GesturePropertyProvider* provider,
                            std::string* status) {
   // We use DT_ALL since we want gesture property values for all devices that
   // run with the gesture library, not just mice or touchpads.
   std::vector<int> ids;
   event_factory->GetDeviceIdsByType(DT_ALL, &ids);
 
   // Dump the property names and values for each device.
   for (size_t i = 0; i < ids.size(); ++i) {
     std::vector<std::string> names = provider->GetPropertyNamesById(ids[i]);
@@ skipping 12 matching lines @@
       status->append("\t" + DumpGesturePropertyValue(property) + '\n');
     }
   }
 }
 
 #endif
 
 }  // namespace
 
 InputControllerEvdev::InputControllerEvdev(
-    EventFactoryEvdev* event_factory,
     KeyboardEvdev* keyboard,
     MouseButtonMapEvdev* button_map
 #if defined(USE_EVDEV_GESTURES)
     ,
     GesturePropertyProvider* gesture_property_provider
 #endif
     )
-    : event_factory_(event_factory),
+    : input_device_factory_(nullptr),
       keyboard_(keyboard),
       button_map_(button_map)
 #if defined(USE_EVDEV_GESTURES)
       ,
       gesture_property_provider_(gesture_property_provider)
 #endif
 {
 }
 
 InputControllerEvdev::~InputControllerEvdev() {
 }
 
+void InputControllerEvdev::SetInputDeviceFactory(
+    InputDeviceFactoryEvdev* input_device_factory) {
+  input_device_factory_ = input_device_factory;
+}
+
 bool InputControllerEvdev::HasMouse() {
-  return event_factory_->GetDeviceIdsByType(DT_MOUSE, NULL);
+  if (!input_device_factory_)
+    return false;
+  return input_device_factory_->GetDeviceIdsByType(DT_MOUSE, NULL);
 }
 
 bool InputControllerEvdev::HasTouchpad() {
-  return event_factory_->GetDeviceIdsByType(DT_TOUCHPAD, NULL);
+  if (!input_device_factory_)
+    return false;
+  return input_device_factory_->GetDeviceIdsByType(DT_TOUCHPAD, NULL);
 }
 
 bool InputControllerEvdev::IsCapsLockEnabled() {
   return keyboard_->IsCapsLockEnabled();
 }
 
 void InputControllerEvdev::SetCapsLockEnabled(bool enabled) {
   keyboard_->SetCapsLockEnabled(enabled);
 }
 
@@ skipping 13 matching lines @@
                                              const base::TimeDelta& interval) {
   keyboard_->SetAutoRepeatRate(delay, interval);
 }
 
 void InputControllerEvdev::GetAutoRepeatRate(base::TimeDelta* delay,
                                              base::TimeDelta* interval) {
   keyboard_->GetAutoRepeatRate(delay, interval);
 }
 
 void InputControllerEvdev::DisableInternalTouchpad() {
-  event_factory_->DisableInternalTouchpad();
+  if (input_device_factory_)
+    input_device_factory_->DisableInternalTouchpad();
 }
 
 void InputControllerEvdev::EnableInternalTouchpad() {
-  event_factory_->EnableInternalTouchpad();
+  if (input_device_factory_)
+    input_device_factory_->EnableInternalTouchpad();
 }
 
 void InputControllerEvdev::DisableInternalKeyboardExceptKeys(
     scoped_ptr<std::set<DomCode>> excepted_keys) {
-  event_factory_->DisableInternalKeyboardExceptKeys(excepted_keys.Pass());
+  if (input_device_factory_) {
+    input_device_factory_->DisableInternalKeyboardExceptKeys(
+        excepted_keys.Pass());
+  }
 }
 
 void InputControllerEvdev::EnableInternalKeyboard() {
-  event_factory_->EnableInternalKeyboard();
+  if (input_device_factory_)
+    input_device_factory_->EnableInternalKeyboard();
 }
 
 void InputControllerEvdev::SetIntPropertyForOneType(const EventDeviceType type,
                                                     const std::string& name,
                                                     int value) {
+  if (!input_device_factory_)
+    return;
 #if defined(USE_EVDEV_GESTURES)
   std::vector<int> ids;
-  event_factory_->GetDeviceIdsByType(type, &ids);
+  input_device_factory_->GetDeviceIdsByType(type, &ids);
   for (size_t i = 0; i < ids.size(); ++i) {
     SetGestureIntProperty(gesture_property_provider_, ids[i], name, value);
   }
 #endif
   // In the future, we may add property setting codes for other non-gesture
   // devices. One example would be keyboard settings.
   // TODO(sheckylin): See http://crbug.com/398518 for example.
 }
 
 void InputControllerEvdev::SetBoolPropertyForOneType(const EventDeviceType type,
                                                      const std::string& name,
                                                      bool value) {
+  if (!input_device_factory_)
+    return;
 #if defined(USE_EVDEV_GESTURES)
   std::vector<int> ids;
-  event_factory_->GetDeviceIdsByType(type, &ids);
+  input_device_factory_->GetDeviceIdsByType(type, &ids);
   for (size_t i = 0; i < ids.size(); ++i) {
     SetGestureBoolProperty(gesture_property_provider_, ids[i], name, value);
   }
 #endif
 }
 
 void InputControllerEvdev::SetTouchpadSensitivity(int value) {
   SetIntPropertyForOneType(DT_TOUCHPAD, "Pointer Sensitivity", value);
   SetIntPropertyForOneType(DT_TOUCHPAD, "Scroll Sensitivity", value);
 }
@@ skipping 28 matching lines @@
 void InputControllerEvdev::SetTapToClickPaused(bool state) {
   SetBoolPropertyForOneType(DT_TOUCHPAD, "Tap Paused", state);
 }
 
 void InputControllerEvdev::GetTouchDeviceStatus(
     const GetTouchDeviceStatusReply& reply) {
   scoped_ptr<std::string> status(new std::string);
 #if defined(USE_EVDEV_GESTURES)
   std::string* status_ptr = status.get();
   base::ThreadTaskRunnerHandle::Get()->PostTaskAndReply(
-      FROM_HERE, base::Bind(&DumpTouchDeviceStatus, event_factory_,
+      FROM_HERE, base::Bind(&DumpTouchDeviceStatus, input_device_factory_,
                             gesture_property_provider_, status_ptr),
       base::Bind(reply, base::Passed(&status)));
 #else
   reply.Run(status.Pass());
 #endif
 }
 
 }  // namespace ui