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

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

Issue 2914103002: Remove usages of XInternAtom (Closed)
Patch Set: Address sadrul and sergeyu comments Created 3 years, 6 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
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 10 matching lines...) Expand all
21 #include <set> 21 #include <set>
22 #include <vector> 22 #include <vector>
23 23
24 #include "base/event_types.h" 24 #include "base/event_types.h"
25 #include "base/macros.h" 25 #include "base/macros.h"
26 #include "ui/events/devices/device_data_manager.h" 26 #include "ui/events/devices/device_data_manager.h"
27 #include "ui/events/devices/x11/events_devices_x11_export.h" 27 #include "ui/events/devices/x11/events_devices_x11_export.h"
28 #include "ui/events/event_constants.h" 28 #include "ui/events/event_constants.h"
29 #include "ui/events/keycodes/keyboard_codes.h" 29 #include "ui/events/keycodes/keyboard_codes.h"
30 #include "ui/gfx/geometry/rect.h" 30 #include "ui/gfx/geometry/rect.h"
31 #include "ui/gfx/x/x11_atom_cache.h"
32 #include "ui/gfx/x/x11_types.h" 31 #include "ui/gfx/x/x11_types.h"
33 32
34 namespace ui { 33 namespace ui {
35 34
36 // CrOS touchpad metrics gesture types 35 // CrOS touchpad metrics gesture types
37 enum GestureMetricsType { 36 enum GestureMetricsType {
38 kGestureMetricsTypeNoisyGround = 0, 37 kGestureMetricsTypeNoisyGround = 0,
39 kGestureMetricsTypeUnknown, 38 kGestureMetricsTypeUnknown,
40 }; 39 };
41 40
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 // XEvent are not reported if the values haven't changed from the previous 389 // XEvent are not reported if the values haven't changed from the previous
391 // event. So it is necessary to remember these valuators so that chrome 390 // event. So it is necessary to remember these valuators so that chrome
392 // doesn't think X/device doesn't know about the valuators. We currently 391 // doesn't think X/device doesn't know about the valuators. We currently
393 // use this only on touchscreen devices. 392 // use this only on touchscreen devices.
394 std::vector<double> last_seen_valuator_[kMaxDeviceNum][kMaxSlotNum]; 393 std::vector<double> last_seen_valuator_[kMaxDeviceNum][kMaxSlotNum];
395 394
396 // Map that stores meta-data for blocked keyboards. This is needed to restore 395 // Map that stores meta-data for blocked keyboards. This is needed to restore
397 // devices when they are re-enabled. 396 // devices when they are re-enabled.
398 std::map<int, ui::InputDevice> blocked_keyboard_devices_; 397 std::map<int, ui::InputDevice> blocked_keyboard_devices_;
399 398
400 // X11 atoms cache.
401 X11AtomCache atom_cache_;
402
403 unsigned char button_map_[256]; 399 unsigned char button_map_[256];
404 int button_map_count_; 400 int button_map_count_;
405 401
406 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11); 402 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
407 }; 403 };
408 404
409 } // namespace ui 405 } // namespace ui
410 406
411 #endif // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_ 407 #endif // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
OLDNEW
« no previous file with comments | « ui/display/util/x11/edid_parser_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