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

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

Issue 538143002: Fix test for master device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Identify virtual core keyboard. 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 | « ui/events/x/events_x_unittest.cc ('k') | ui/events/x/touch_factory_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 (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_X_TOUCH_FACTORY_X11_H_
6 #define UI_EVENTS_X_TOUCH_FACTORY_X11_H_ 6 #define UI_EVENTS_X_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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // Maps from a tracking id to the number of times |ReleaseSlotForTrackingID| 140 // Maps from a tracking id to the number of times |ReleaseSlotForTrackingID|
141 // must be called before the tracking id is released. 141 // must be called before the tracking id is released.
142 std::map<uint32, int> tracking_id_refcounts_; 142 std::map<uint32, int> tracking_id_refcounts_;
143 143
144 // Maximum simultaneous touch points supported by device. In the case of 144 // Maximum simultaneous touch points supported by device. In the case of
145 // devices with multiple digitizers (e.g. multiple touchscreens), the value 145 // devices with multiple digitizers (e.g. multiple touchscreens), the value
146 // is the maximum of the set of maximum supported contacts by each individual 146 // is the maximum of the set of maximum supported contacts by each individual
147 // digitizer. 147 // digitizer.
148 int max_touch_points_; 148 int max_touch_points_;
149 149
150 // Device ID of the virtual core keyboard.
151 int virtual_core_keyboard_device_;
152
150 SequentialIDGenerator id_generator_; 153 SequentialIDGenerator id_generator_;
151 154
152 DISALLOW_COPY_AND_ASSIGN(TouchFactory); 155 DISALLOW_COPY_AND_ASSIGN(TouchFactory);
153 }; 156 };
154 157
155 } // namespace ui 158 } // namespace ui
156 159
157 #endif // UI_EVENTS_X_TOUCH_FACTORY_X11_H_ 160 #endif // UI_EVENTS_X_TOUCH_FACTORY_X11_H_
OLDNEW
« no previous file with comments | « ui/events/x/events_x_unittest.cc ('k') | ui/events/x/touch_factory_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698