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

Side by Side Diff: views/touchui/touch_factory.cc

Issue 6975045: touch: Always expect XInput2 availability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « views/focus/accelerator_handler_touch.cc ('k') | views/views.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/touchui/touch_factory.h" 5 #include "views/touchui/touch_factory.h"
6 6
7 #if defined(HAVE_XINPUT2)
8
9 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
10 #include <gdk/gdkx.h> 8 #include <gdk/gdkx.h>
11 #include <X11/cursorfont.h> 9 #include <X11/cursorfont.h>
12 #include <X11/extensions/XInput.h> 10 #include <X11/extensions/XInput.h>
13 #include <X11/extensions/XInput2.h> 11 #include <X11/extensions/XInput2.h>
14 #include <X11/extensions/XIproto.h> 12 #include <X11/extensions/XIproto.h>
15 13
16 #include "base/basictypes.h" 14 #include "base/basictypes.h"
17 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
18 #include "base/logging.h" 16 #include "base/logging.h"
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 float* max) { 412 float* max) {
415 if (valuator_lookup_[deviceid][tp] >= 0) { 413 if (valuator_lookup_[deviceid][tp] >= 0) {
416 *min = touch_param_min_[deviceid][tp]; 414 *min = touch_param_min_[deviceid][tp];
417 *max = touch_param_max_[deviceid][tp]; 415 *max = touch_param_max_[deviceid][tp];
418 return true; 416 return true;
419 } 417 }
420 return false; 418 return false;
421 } 419 }
422 420
423 } // namespace views 421 } // namespace views
424
425 #endif // defined(HAVE_XINPUT2)
OLDNEW
« no previous file with comments | « views/focus/accelerator_handler_touch.cc ('k') | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698