[PATCH 7/11] ozone: evdev: Move GesturePropertyProvider to InputDeviceFactoryEvdev

ui/events/ozone/evdev/input_controller_evdev.h

Index: ui/events/ozone/evdev/input_controller_evdev.h
diff --git a/ui/events/ozone/evdev/input_controller_evdev.h b/ui/events/ozone/evdev/input_controller_evdev.h
index bc76b30edd5c038dcbcc2245f8686b71d2e192ec..963d6297688b291613bca107c1728366bb7bbe58 100644
--- a/ui/events/ozone/evdev/input_controller_evdev.h
+++ b/ui/events/ozone/evdev/input_controller_evdev.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 #include "ui/ozone/public/input_controller.h"
 
@@ -18,20 +17,11 @@ class InputDeviceFactoryEvdev;
 class KeyboardEvdev;
 class MouseButtonMapEvdev;
 
-#if defined(USE_EVDEV_GESTURES)
-class GesturePropertyProvider;
-#endif
-
 // Ozone InputController implementation for the Linux input subsystem ("evdev").
 class EVENTS_OZONE_EVDEV_EXPORT InputControllerEvdev : public InputController {
  public:
   InputControllerEvdev(KeyboardEvdev* keyboard,
-                       MouseButtonMapEvdev* button_map
-#if defined(USE_EVDEV_GESTURES)
-                       ,
-                       GesturePropertyProvider* gesture_property_provider
-#endif
-                       );
+                       MouseButtonMapEvdev* button_map);
   ~InputControllerEvdev() override;
 
   // Initialize device factory. This would be in the constructor if it was
@@ -66,14 +56,6 @@ class EVENTS_OZONE_EVDEV_EXPORT InputControllerEvdev : public InputController {
   void EnableInternalKeyboard() override;
 
  private:
-  // Set a property value for all devices of one type.
-  void SetIntPropertyForOneType(const EventDeviceType type,
-                                const std::string& name,
-                                int value);
-  void SetBoolPropertyForOneType(const EventDeviceType type,
-                                 const std::string& name,
-                                 bool value);
-
   // Factory for devices. Needed to update device config.
   InputDeviceFactoryEvdev* input_device_factory_;
 
@@ -83,11 +65,6 @@ class EVENTS_OZONE_EVDEV_EXPORT InputControllerEvdev : public InputController {
   // Mouse button map.
   MouseButtonMapEvdev* button_map_;
 
-#if defined(USE_EVDEV_GESTURES)
-  // Gesture library property provider.
-  GesturePropertyProvider* gesture_property_provider_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(InputControllerEvdev);
 };