Index: ui/events/device_data_manager.h |
diff --git a/ui/events/device_data_manager.h b/ui/events/device_data_manager.h |
index aae827204cc5e7e11aae927a68e244c587cb5469..974fbc0f3fb0def89d5a2f6c1d837ab889291058 100644 |
--- a/ui/events/device_data_manager.h |
+++ b/ui/events/device_data_manager.h |
@@ -14,6 +14,7 @@ |
#include "base/observer_list.h" |
#include "ui/events/device_hotplug_event_observer.h" |
#include "ui/events/events_base_export.h" |
+#include "ui/events/keyboard_device.h" |
#include "ui/events/touchscreen_device.h" |
#include "ui/gfx/transform.h" |
@@ -44,6 +45,10 @@ class EVENTS_BASE_EXPORT DeviceDataManager : public DeviceHotplugEventObserver { |
return touchscreen_devices_; |
} |
+ const std::vector<KeyboardDevice>& keyboard_devices() const { |
+ return keyboard_devices_; |
+ } |
+ |
void AddObserver(InputDeviceEventObserver* observer); |
void RemoveObserver(InputDeviceEventObserver* observer); |
@@ -62,6 +67,8 @@ class EVENTS_BASE_EXPORT DeviceDataManager : public DeviceHotplugEventObserver { |
// DeviceHotplugEventObserver: |
virtual void OnTouchscreenDevicesUpdated( |
const std::vector<TouchscreenDevice>& devices) OVERRIDE; |
+ virtual void OnKeyboardDevicesUpdated( |
+ const std::vector<KeyboardDevice>& devices) OVERRIDE; |
flackr
2014/10/04 00:51:31
Can you override this in DeviceDataManagerX11 to r
rsadam
2014/10/04 18:46:27
Done.
|
double touch_radius_scale_map_[kMaxDeviceNum]; |
@@ -71,6 +78,7 @@ class EVENTS_BASE_EXPORT DeviceDataManager : public DeviceHotplugEventObserver { |
gfx::Transform touch_device_transformer_map_[kMaxDeviceNum]; |
std::vector<TouchscreenDevice> touchscreen_devices_; |
+ std::vector<KeyboardDevice> keyboard_devices_; |
ObserverList<InputDeviceEventObserver> observers_; |