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

Side by Side Diff: ui/events/x/device_data_manager_x11.h

Issue 512553003: Remove include of ui/events/event.h from device_data_manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/x/events_x.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_X_DEVICE_DATA_MANAGER_X11_H_ 5 #ifndef UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_
6 #define UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_ 6 #define UI_EVENTS_X_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.
11 #ifndef Bool 11 #ifndef Bool
12 #define Bool int 12 #define Bool int
13 #endif 13 #endif
14 14
15 #include <X11/extensions/XInput2.h> 15 #include <X11/extensions/XInput2.h>
16 16
17 #include <bitset> 17 #include <bitset>
18 #include <map> 18 #include <map>
19 #include <set> 19 #include <set>
20 #include <vector> 20 #include <vector>
21 21
22 #include "base/basictypes.h" 22 #include "base/basictypes.h"
23 #include "base/event_types.h" 23 #include "base/event_types.h"
24 #include "base/memory/scoped_ptr.h" 24 #include "base/memory/scoped_ptr.h"
25 #include "ui/events/device_data_manager.h" 25 #include "ui/events/device_data_manager.h"
26 #include "ui/events/event.h"
27 #include "ui/events/event_constants.h" 26 #include "ui/events/event_constants.h"
28 #include "ui/events/events_base_export.h" 27 #include "ui/events/events_base_export.h"
28 #include "ui/events/keycodes/keyboard_codes.h"
29 #include "ui/gfx/geometry/rect.h" 29 #include "ui/gfx/geometry/rect.h"
30 #include "ui/gfx/x/x11_atom_cache.h" 30 #include "ui/gfx/x/x11_atom_cache.h"
31 31
32 typedef union _XEvent XEvent; 32 typedef union _XEvent XEvent;
33 33
34 namespace ui { 34 namespace ui {
35 35
36 // CrOS touchpad metrics gesture types 36 // CrOS touchpad metrics gesture types
37 enum GestureMetricsType { 37 enum GestureMetricsType {
38 kGestureMetricsTypeNoisyGround = 0, 38 kGestureMetricsTypeNoisyGround = 0,
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 305
306 unsigned char button_map_[256]; 306 unsigned char button_map_[256];
307 int button_map_count_; 307 int button_map_count_;
308 308
309 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11); 309 DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
310 }; 310 };
311 311
312 } // namespace ui 312 } // namespace ui
313 313
314 #endif // UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_ 314 #endif // UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_
OLDNEW
« no previous file with comments | « no previous file | ui/events/x/events_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698