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

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

Issue 2028593004: Add new InputDeviceManager interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_keyboard
Patch Set: Fix windows compile error. 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
Index: ui/events/devices/x11/device_data_manager_x11.cc
diff --git a/ui/events/devices/x11/device_data_manager_x11.cc b/ui/events/devices/x11/device_data_manager_x11.cc
index c5adcb29f3280fcc68332146bb2b17b60d4f9a76..0d9d04c9170a89568f1afa5fad64e646476ef954 100644
--- a/ui/events/devices/x11/device_data_manager_x11.cc
+++ b/ui/events/devices/x11/device_data_manager_x11.cc
@@ -817,7 +817,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedKeys(
void DeviceDataManagerX11::DisableDevice(int deviceid) {
blocked_devices_.set(deviceid, true);
// TODO(rsadam@): Support blocking touchscreen devices.
- std::vector<InputDevice> keyboards = keyboard_devices();
+ std::vector<InputDevice> keyboards = GetKeyboardDevices();
std::vector<InputDevice>::iterator it =
FindDeviceWithId(keyboards.begin(), keyboards.end(), deviceid);
if (it != std::end(keyboards)) {
@@ -833,7 +833,7 @@ void DeviceDataManagerX11::EnableDevice(int deviceid) {
std::map<int, InputDevice>::iterator it =
blocked_keyboard_devices_.find(deviceid);
if (it != blocked_keyboard_devices_.end()) {
- std::vector<InputDevice> devices = keyboard_devices();
+ std::vector<InputDevice> devices = GetKeyboardDevices();
// Add device to current list of active devices.
devices.push_back((*it).second);
blocked_keyboard_devices_.erase(it);
« no previous file with comments | « ui/events/devices/input_device_manager.cc ('k') | ui/events/devices/x11/device_data_manager_x11_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698