| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_TOUCH_FACTORY_X11_H_ | 5 #ifndef UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_ |
| 6 #define UI_EVENTS_X_TOUCH_FACTORY_X11_H_ | 6 #define UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_ |
| 7 | 7 |
| 8 #include <bitset> | 8 #include <bitset> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| 11 #include <utility> | 11 #include <utility> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "ui/events/events_base_export.h" | 14 #include "ui/events/devices/events_devices_export.h" |
| 15 #include "ui/gfx/sequential_id_generator.h" | 15 #include "ui/gfx/sequential_id_generator.h" |
| 16 | 16 |
| 17 template <typename T> struct DefaultSingletonTraits; | 17 template <typename T> struct DefaultSingletonTraits; |
| 18 | 18 |
| 19 typedef unsigned long Cursor; | 19 typedef unsigned long Cursor; |
| 20 typedef unsigned long Window; | 20 typedef unsigned long Window; |
| 21 typedef struct _XDisplay Display; | 21 typedef struct _XDisplay Display; |
| 22 typedef union _XEvent XEvent; | 22 typedef union _XEvent XEvent; |
| 23 | 23 |
| 24 namespace ui { | 24 namespace ui { |
| 25 | 25 |
| 26 // Functions related to determining touch devices. | 26 // Functions related to determining touch devices. |
| 27 class EVENTS_BASE_EXPORT TouchFactory { | 27 class EVENTS_DEVICES_EXPORT TouchFactory { |
| 28 private: | 28 private: |
| 29 TouchFactory(); | 29 TouchFactory(); |
| 30 ~TouchFactory(); | 30 ~TouchFactory(); |
| 31 | 31 |
| 32 public: | 32 public: |
| 33 // Returns the TouchFactory singleton. | 33 // Returns the TouchFactory singleton. |
| 34 static TouchFactory* GetInstance(); | 34 static TouchFactory* GetInstance(); |
| 35 | 35 |
| 36 // Sets the touch devices from the command line. | 36 // Sets the touch devices from the command line. |
| 37 static void SetTouchDeviceListFromCommandLine(); | 37 static void SetTouchDeviceListFromCommandLine(); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // Device ID of the virtual core keyboard. | 146 // Device ID of the virtual core keyboard. |
| 147 int virtual_core_keyboard_device_; | 147 int virtual_core_keyboard_device_; |
| 148 | 148 |
| 149 SequentialIDGenerator id_generator_; | 149 SequentialIDGenerator id_generator_; |
| 150 | 150 |
| 151 DISALLOW_COPY_AND_ASSIGN(TouchFactory); | 151 DISALLOW_COPY_AND_ASSIGN(TouchFactory); |
| 152 }; | 152 }; |
| 153 | 153 |
| 154 } // namespace ui | 154 } // namespace ui |
| 155 | 155 |
| 156 #endif // UI_EVENTS_X_TOUCH_FACTORY_X11_H_ | 156 #endif // UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_ |
| OLD | NEW |