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

Unified Diff: base/message_pump_x.cc

Issue 7792094: touchui: support XInput2 MT (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Add gyp switch to support both XI2.0 and XI2.1. Correct the style issues also. Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | views/focus/accelerator_handler_touch.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/message_pump_x.cc
diff --git a/base/message_pump_x.cc b/base/message_pump_x.cc
index 8e098af95924e57269b906f21eb7975d926d3c0f..98efb11dbc3a1719988bf83e542713fd9330bd7b 100644
--- a/base/message_pump_x.cc
+++ b/base/message_pump_x.cc
@@ -70,9 +70,14 @@ void InitializeXInput2(void) {
return;
}
+#if defined(USE_XI2_1)
+ int major = 2, minor = 1;
+#else
int major = 2, minor = 0;
+#endif
if (XIQueryVersion(display, &major, &minor) == BadRequest) {
- VLOG(1) << "XInput2 not supported in the server.";
+ VLOG(1) << "XInput" << major << "." << minor
+ << "not supported in the server.";
xiopcode = -1;
return;
}
« no previous file with comments | « no previous file | build/common.gypi » ('j') | views/focus/accelerator_handler_touch.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698