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

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

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Deprecate the histogram. Created 4 years 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 (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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <bitset> 10 #include <bitset>
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 std::set<std::pair<int, int> > touchscreen_ids_; 135 std::set<std::pair<int, int> > touchscreen_ids_;
136 136
137 // Device ID of the virtual core keyboard. 137 // Device ID of the virtual core keyboard.
138 int virtual_core_keyboard_device_; 138 int virtual_core_keyboard_device_;
139 139
140 SequentialIDGenerator id_generator_; 140 SequentialIDGenerator id_generator_;
141 141
142 // Associate each device ID with its master device ID. 142 // Associate each device ID with its master device ID.
143 std::map<int, int> device_master_id_list_; 143 std::map<int, int> device_master_id_list_;
144 144
145 // Indicates whether touch events are explicitly disabled by the flag
146 // #touch-events.
147 bool touch_events_flag_disabled_;
148
149 // The status of the touch screens devices themselves. 145 // The status of the touch screens devices themselves.
150 bool touch_screens_enabled_; 146 bool touch_screens_enabled_;
151 147
152 DISALLOW_COPY_AND_ASSIGN(TouchFactory); 148 DISALLOW_COPY_AND_ASSIGN(TouchFactory);
153 }; 149 };
154 150
155 } // namespace ui 151 } // namespace ui
156 152
157 #endif // UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_ 153 #endif // UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698