Add new InputDeviceManager interface.

ui/events/devices/device_data_manager.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_DEVICES_DEVICE_DATA_MANAGER_H_
 #define UI_EVENTS_DEVICES_DEVICE_DATA_MANAGER_H_
 
 #include <stdint.h>
 
 #include <array>
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/events/devices/device_hotplug_event_observer.h"
 #include "ui/events/devices/events_devices_export.h"
+#include "ui/events/devices/input_device_manager.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/gfx/transform.h"
 
 namespace ui {
 
 namespace test {
 class DeviceDataManagerTestAPI;
 }  // namespace test
 
 class InputDeviceEventObserver;
 
 // Keeps track of device mappings and event transformations.
 class EVENTS_DEVICES_EXPORT DeviceDataManager
-    : public DeviceHotplugEventObserver {
+    : public InputDeviceManager,
+      public DeviceHotplugEventObserver {
  public:
   static const int kMaxDeviceNum = 128;
   ~DeviceDataManager() override;
 
   static void CreateInstance();
   static void DeleteInstance();
   static DeviceDataManager* GetInstance();
   static bool HasInstance();
 
   void ClearTouchDeviceAssociations();
   void UpdateTouchInfoForDisplay(int64_t target_display_id,
                                  int touch_device_id,
                                  const gfx::Transform& touch_transformer);
   void ApplyTouchTransformer(int touch_device_id, float* x, float* y);
 
   // Gets the display that touches from |touch_device_id| should be sent to.
   int64_t GetTargetDisplayForTouchDevice(int touch_device_id) const;
 
   void UpdateTouchRadiusScale(int touch_device_id, double scale);
   void ApplyTouchRadiusScale(int touch_device_id, double* radius);
 
-  const std::vector<TouchscreenDevice>& touchscreen_devices() const {
-    return touchscreen_devices_;
-  }
+  void SetTouchscreensEnabled(bool enabled);
 
-  const std::vector<InputDevice>& keyboard_devices() const {
-    return keyboard_devices_;
-  }
+  // InputDeviceManager:
+  const std::vector<TouchscreenDevice>& touchscreen_devices() const override;
+  const std::vector<InputDevice>& keyboard_devices() const override;
+  const std::vector<InputDevice>& mouse_devices() const override;
+  const std::vector<InputDevice>& touchpad_devices() const override;
+  bool device_lists_complete() const override;
+  bool AreTouchscreensEnabled() const override;
 
-  const std::vector<InputDevice>& mouse_devices() const {
-    return mouse_devices_;
-  }
-
-  const std::vector<InputDevice>& touchpad_devices() const {
-    return touchpad_devices_;
-  }
-
-  bool device_lists_complete() const { return device_lists_complete_; }
-
-  void AddObserver(InputDeviceEventObserver* observer);
-  void RemoveObserver(InputDeviceEventObserver* observer);
-
-  void SetTouchscreensEnabled(bool enabled);
-  bool AreTouchscreensEnabled() const;
+  void AddObserver(InputDeviceEventObserver* observer) override;
+  void RemoveObserver(InputDeviceEventObserver* observer) override;
 
  protected:
   DeviceDataManager();
 
   static DeviceDataManager* instance();
 
   static void set_instance(DeviceDataManager* instance);
 
   // DeviceHotplugEventObserver:
   void OnTouchscreenDevicesUpdated(
@@ skipping 43 matching lines @@
   // have default values if the device with corresponding ID isn't a touchscreen
   // or doesn't exist.
   std::array<TouchscreenInfo, kMaxDeviceNum> touch_map_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDataManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_DEVICES_DEVICE_DATA_MANAGER_H_