| Index: ui/events/platform/x11/x11_hotplug_event_handler.cc
|
| diff --git a/ui/events/platform/x11/x11_hotplug_event_handler.cc b/ui/events/platform/x11/x11_hotplug_event_handler.cc
|
| index cea935d3dad7043cd7e32764a1a05c4def15b6f7..b05de3c33236ecbb82542c40d9d65ed768b4ebf5 100644
|
| --- a/ui/events/platform/x11/x11_hotplug_event_handler.cc
|
| +++ b/ui/events/platform/x11/x11_hotplug_event_handler.cc
|
| @@ -29,7 +29,6 @@
|
| #include "ui/events/devices/device_hotplug_event_observer.h"
|
| #include "ui/events/devices/device_util_linux.h"
|
| #include "ui/events/devices/input_device.h"
|
| -#include "ui/events/devices/keyboard_device.h"
|
| #include "ui/events/devices/touchscreen_device.h"
|
| #include "ui/gfx/x/x11_types.h"
|
|
|
| @@ -70,7 +69,7 @@ enum DeviceType {
|
| DEVICE_TYPE_OTHER
|
| };
|
|
|
| -typedef base::Callback<void(const std::vector<KeyboardDevice>&)>
|
| +typedef base::Callback<void(const std::vector<InputDevice>&)>
|
| KeyboardDeviceCallback;
|
|
|
| typedef base::Callback<void(const std::vector<TouchscreenDevice>&)>
|
| @@ -252,7 +251,7 @@ void HandleKeyboardDevicesInWorker(
|
| const std::vector<DeviceInfo>& device_infos,
|
| scoped_refptr<base::TaskRunner> reply_runner,
|
| const KeyboardDeviceCallback& callback) {
|
| - std::vector<KeyboardDevice> devices;
|
| + std::vector<InputDevice> devices;
|
|
|
| for (const DeviceInfo& device_info : device_infos) {
|
| if (device_info.type != DEVICE_TYPE_KEYBOARD)
|
| @@ -262,7 +261,7 @@ void HandleKeyboardDevicesInWorker(
|
| if (IsKnownInvalidKeyboardDevice(device_info.name))
|
| continue; // Skip invalid devices.
|
| InputDeviceType type = GetInputDeviceTypeFromPath(device_info.path);
|
| - KeyboardDevice keyboard(device_info.id, type, device_info.name);
|
| + InputDevice keyboard(device_info.id, type, device_info.name);
|
| devices.push_back(keyboard);
|
| }
|
|
|
| @@ -384,7 +383,7 @@ DeviceHotplugEventObserver* GetHotplugEventObserver() {
|
| return DeviceDataManager::GetInstance();
|
| }
|
|
|
| -void OnKeyboardDevices(const std::vector<KeyboardDevice>& devices) {
|
| +void OnKeyboardDevices(const std::vector<InputDevice>& devices) {
|
| GetHotplugEventObserver()->OnKeyboardDevicesUpdated(devices);
|
| }
|
|
|
|
|