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

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

Issue 49383011: Build fix linux aura without USE_XI2_MT. (Closed) Base URL: https://git.chromium.org/chromium/src.git@ime
Patch Set: Created 7 years, 1 month 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
« ui/events/DEPS ('K') | « ui/events/DEPS ('k') | no next file » | 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 #include "ui/events/x/touch_factory_x11.h" 5 #include "ui/events/x/touch_factory_x11.h"
6 6
7 #include <X11/cursorfont.h> 7 #include <X11/cursorfont.h>
8 #include <X11/extensions/XInput.h> 8 #include <X11/extensions/XInput.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #include <X11/extensions/XIproto.h> 10 #include <X11/extensions/XIproto.h>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/memory/singleton.h" 16 #include "base/memory/singleton.h"
17 #include "base/message_loop/message_loop.h" 17 #include "base/message_loop/message_loop.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
20 #include "ui/events/event_switches.h" 20 #include "ui/events/event_switches.h"
21 #include "ui/events/x/device_list_cache_x.h" 21 #include "ui/events/x/device_list_cache_x.h"
22 #include "ui/gfx/x/x11_types.h" 22 #include "ui/gfx/x/x11_types.h"
23 23
24 #if !defined(USE_XI2_MT)
25 #include "ui/base/x/x11_util.h"
26 #endif
27
24 namespace ui { 28 namespace ui {
25 29
26 TouchFactory::TouchFactory() 30 TouchFactory::TouchFactory()
27 : pointer_device_lookup_(), 31 : pointer_device_lookup_(),
28 touch_device_available_(false), 32 touch_device_available_(false),
29 touch_events_disabled_(false), 33 touch_events_disabled_(false),
30 touch_device_list_(), 34 touch_device_list_(),
31 id_generator_(0) { 35 id_generator_(0) {
32 #if defined(USE_AURA) 36 #if defined(USE_AURA)
33 if (!base::MessagePumpForUI::HasXInput2()) 37 if (!base::MessagePumpForUI::HasXInput2())
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 iter != devices.end(); ++iter) { 249 iter != devices.end(); ++iter) {
246 DCHECK(*iter < touch_device_lookup_.size()); 250 DCHECK(*iter < touch_device_lookup_.size());
247 touch_device_lookup_[*iter] = true; 251 touch_device_lookup_[*iter] = true;
248 touch_device_list_[*iter] = true; 252 touch_device_list_[*iter] = true;
249 } 253 }
250 touch_device_available_ = true; 254 touch_device_available_ = true;
251 touch_events_disabled_ = false; 255 touch_events_disabled_ = false;
252 } 256 }
253 257
254 } // namespace ui 258 } // namespace ui
OLDNEW
« ui/events/DEPS ('K') | « ui/events/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698