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

ui/events/ozone/evdev/input_controller_evdev.h

 // 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.
 
 #ifndef UI_EVENTS_OZONE_EVDEV_INPUT_CONTROLLER_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_INPUT_CONTROLLER_EVDEV_H_
 
 #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"
 
 namespace ui {
 
 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
   // built early enough for that to be possible.
   void SetInputDeviceFactory(InputDeviceFactoryEvdev* input_device_factory);
 
   // InputController:
   bool HasMouse() override;
   bool HasTouchpad() override;
   bool IsCapsLockEnabled() override;
@@ skipping 14 matching lines @@
   void SetPrimaryButtonRight(bool right) override;
   void SetTapToClickPaused(bool state) override;
   void GetTouchDeviceStatus(const GetTouchDeviceStatusReply& reply) override;
   void DisableInternalTouchpad() override;
   void EnableInternalTouchpad() override;
   void DisableInternalKeyboardExceptKeys(
       scoped_ptr<std::set<DomCode>> excepted_keys) override;
   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_;
 
   // Keyboard state.
   KeyboardEvdev* keyboard_;
 
   // 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);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_INPUT_CONTROLLER_EVDEV_H_