| Index: ui/events/devices/x11/device_data_manager_x11.h
|
| diff --git a/ui/events/devices/x11/device_data_manager_x11.h b/ui/events/devices/x11/device_data_manager_x11.h
|
| index 072378e05687545c9f74a72d6c9e6b6705563f94..c07aed4549845023b4a09957d8a921e5f9966e8f 100644
|
| --- a/ui/events/devices/x11/device_data_manager_x11.h
|
| +++ b/ui/events/devices/x11/device_data_manager_x11.h
|
| @@ -277,7 +277,7 @@ class EVENTS_DEVICES_X11_EXPORT DeviceDataManagerX11
|
| protected:
|
| // DeviceHotplugEventObserver:
|
| void OnKeyboardDevicesUpdated(
|
| - const std::vector<KeyboardDevice>& devices) override;
|
| + const std::vector<InputDevice>& devices) override;
|
|
|
| private:
|
| // Information about scroll valuators
|
| @@ -383,7 +383,7 @@ class EVENTS_DEVICES_X11_EXPORT DeviceDataManagerX11
|
|
|
| // Map that stores meta-data for blocked keyboards. This is needed to restore
|
| // devices when they are re-enabled.
|
| - std::map<int, ui::KeyboardDevice> blocked_keyboards_;
|
| + std::map<int, ui::InputDevice> blocked_keyboard_devices_;
|
|
|
| // X11 atoms cache.
|
| X11AtomCache atom_cache_;
|
|
|