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

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

Issue 1637873002: Remove unused TouchEventCalibrate class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also remove unnused method. Created 4 years, 11 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 | « ui/aura/window_tree_host_x11.cc ('k') | 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 // the actual device info, but rather inits the relevant valuator structures 249 // the actual device info, but rather inits the relevant valuator structures
250 // to have safe default values for testing. 250 // to have safe default values for testing.
251 void SetDeviceListForTest(const std::vector<int>& touchscreen, 251 void SetDeviceListForTest(const std::vector<int>& touchscreen,
252 const std::vector<int>& cmt_devices, 252 const std::vector<int>& cmt_devices,
253 const std::vector<int>& other_devices); 253 const std::vector<int>& other_devices);
254 254
255 void SetValuatorDataForTest(XIDeviceEvent* xievent, 255 void SetValuatorDataForTest(XIDeviceEvent* xievent,
256 DataType type, 256 DataType type,
257 double value); 257 double value);
258 258
259 bool TouchEventNeedsCalibrate(int touch_device_id) const;
260
261 // Sets the keys which are still allowed on a disabled keyboard device. 259 // Sets the keys which are still allowed on a disabled keyboard device.
262 void SetDisabledKeyboardAllowedKeys( 260 void SetDisabledKeyboardAllowedKeys(
263 scoped_ptr<std::set<KeyboardCode> > excepted_keys); 261 scoped_ptr<std::set<KeyboardCode> > excepted_keys);
264 262
265 // Disables and enables events from devices by device id. 263 // Disables and enables events from devices by device id.
266 void DisableDevice(int deviceid); 264 void DisableDevice(int deviceid);
267 void EnableDevice(int deviceid); 265 void EnableDevice(int deviceid);
268 266
269 bool IsDeviceEnabled(int device_id) const; 267 bool IsDeviceEnabled(int device_id) const;
270 268
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 390
393 unsigned char button_map_[256]; 391 unsigned char button_map_[256];
394 int button_map_count_; 392 int button_map_count_;
395 393
396 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11); 394 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
397 }; 395 };
398 396
399 } // namespace ui 397 } // namespace ui
400 398
401 #endif // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_ 399 #endif // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
OLDNEW
« no previous file with comments | « ui/aura/window_tree_host_x11.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