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

Side by Side Diff: ui/events/devices/x11/device_data_manager_x11.h

Issue 1896483002: Removed DeviceDataManagerX11::scrollclass_devices_ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_ 5 #ifndef UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
6 #define UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_ 6 #define UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
7 7
8 // Generically-named #defines from Xlib is conflicting with symbols in GTest. 8 // Generically-named #defines from Xlib is conflicting with symbols in GTest.
9 // So many tests .cc file #undef Bool before including device_data_manager.h, 9 // So many tests .cc file #undef Bool before including device_data_manager.h,
10 // which makes Bool unrecognized in XInput2.h. 10 // which makes Bool unrecognized in XInput2.h.
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // Major opcode for the XInput extension. Used to identify XInput events. 333 // Major opcode for the XInput extension. Used to identify XInput events.
334 int xi_opcode_; 334 int xi_opcode_;
335 335
336 // A quick lookup table for determining if the XI event is an XIDeviceEvent. 336 // A quick lookup table for determining if the XI event is an XIDeviceEvent.
337 std::bitset<kMaxXIEventType> xi_device_event_types_; 337 std::bitset<kMaxXIEventType> xi_device_event_types_;
338 338
339 // A quick lookup table for determining if events from the pointer device 339 // A quick lookup table for determining if events from the pointer device
340 // should be processed. 340 // should be processed.
341 std::bitset<kMaxDeviceNum> cmt_devices_; 341 std::bitset<kMaxDeviceNum> cmt_devices_;
342 std::bitset<kMaxDeviceNum> touchpads_; 342 std::bitset<kMaxDeviceNum> touchpads_;
343 std::bitset<kMaxDeviceNum> scrollclass_devices_;
344 343
345 // List of the master pointer devices. 344 // List of the master pointer devices.
346 std::vector<int> master_pointers_; 345 std::vector<int> master_pointers_;
347 346
348 // A quick lookup table for determining if events from the XI device 347 // A quick lookup table for determining if events from the XI device
349 // should be blocked. 348 // should be blocked.
350 std::bitset<kMaxDeviceNum> blocked_devices_; 349 std::bitset<kMaxDeviceNum> blocked_devices_;
351 350
352 // The set of keys allowed while the keyboard is blocked. 351 // The set of keys allowed while the keyboard is blocked.
353 std::unique_ptr<std::set<KeyboardCode>> blocked_keyboard_allowed_keys_; 352 std::unique_ptr<std::set<KeyboardCode>> blocked_keyboard_allowed_keys_;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 389
391 unsigned char button_map_[256]; 390 unsigned char button_map_[256];
392 int button_map_count_; 391 int button_map_count_;
393 392
394 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11); 393 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
395 }; 394 };
396 395
397 } // namespace ui 396 } // namespace ui
398 397
399 #endif // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_ 398 #endif // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
OLDNEW
« no previous file with comments | « no previous file | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698