Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/devices/x11/device_data_manager_x11.h

Issue 2019413002: Remove KeyboardDevice class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/events/event_rewriter.cc ('K') | « ui/events/devices/keyboard_device.cc ('k') | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..68462c16a54d37bc4bd1639a3dd937d536a1fa68 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_keyboards_;
sky 2016/05/31 18:13:45 blocked_keyboard_devices?
kylechar 2016/05/31 19:31:12 Done.
// X11 atoms cache.
X11AtomCache atom_cache_;
« chrome/browser/chromeos/events/event_rewriter.cc ('K') | « ui/events/devices/keyboard_device.cc ('k') | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698