| 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_DEVICES_X11_TOUCH_FACTORY_X11_H_ | 5 #ifndef UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_ |
| 6 #define UI_EVENTS_DEVICES_X11_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> |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 std::set<std::pair<int, int> > touchscreen_ids_; | 130 std::set<std::pair<int, int> > touchscreen_ids_; |
| 131 | 131 |
| 132 // Device ID of the virtual core keyboard. | 132 // Device ID of the virtual core keyboard. |
| 133 int virtual_core_keyboard_device_; | 133 int virtual_core_keyboard_device_; |
| 134 | 134 |
| 135 SequentialIDGenerator id_generator_; | 135 SequentialIDGenerator id_generator_; |
| 136 | 136 |
| 137 // Associate each device ID with its master device ID. | 137 // Associate each device ID with its master device ID. |
| 138 std::map<int, int> device_master_id_list_; | 138 std::map<int, int> device_master_id_list_; |
| 139 | 139 |
| 140 // Indicates whether touch events are explicitly disabled. |
| 141 bool touch_events_disabled_; |
| 142 |
| 140 DISALLOW_COPY_AND_ASSIGN(TouchFactory); | 143 DISALLOW_COPY_AND_ASSIGN(TouchFactory); |
| 141 }; | 144 }; |
| 142 | 145 |
| 143 } // namespace ui | 146 } // namespace ui |
| 144 | 147 |
| 145 #endif // UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_ | 148 #endif // UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_ |
| OLD | NEW |