[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 <linux/input.h>
 #include <vector>
 
-#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 17 matching lines @@
   if (property) {
     std::vector<bool> values(1, value);
     property->SetBoolValue(values);
   }
 }
 #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 false;
 }
 
 void InputControllerEvdev::SetCapsLockEnabled(bool enabled) {
   NOTIMPLEMENTED();
 }
 
@@ 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(

[alexst (slow to review), 2015/01/27 19:31:41]

nit: I prefer a set of curly braces once it becomes multiline statement, even if
due to formatting.

[spang, 2015/01/28 01:40:46]

Done.

+        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 23 matching lines @@
 void InputControllerEvdev::SetPrimaryButtonRight(bool right) {
   button_map_->UpdateButtonMap(BTN_LEFT, right ? BTN_RIGHT : BTN_LEFT);
   button_map_->UpdateButtonMap(BTN_RIGHT, right ? BTN_LEFT : BTN_RIGHT);
 }
 
 void InputControllerEvdev::SetTapToClickPaused(bool state) {
   SetBoolPropertyForOneType(DT_TOUCHPAD, "Tap Paused", state);
 }
 
 }  // namespace ui