| Index: ui/events/platform/x11/x11_event_source.cc
|
| diff --git a/ui/events/platform/x11/x11_event_source.cc b/ui/events/platform/x11/x11_event_source.cc
|
| index 424b4be67a926ad58bd8bc716eeaf1a38ee9d5ca..5101f2703a3bff44f677e1c64db1a2ec09532980 100644
|
| --- a/ui/events/platform/x11/x11_event_source.cc
|
| +++ b/ui/events/platform/x11/x11_event_source.cc
|
| @@ -35,23 +35,16 @@ bool InitializeXInput2(XDisplay* display) {
|
| }
|
| g_xinput_opcode = xiopcode;
|
|
|
| -#if defined(USE_XI2_MT)
|
| - // USE_XI2_MT also defines the required XI2 minor minimum version.
|
| - int major = 2, minor = USE_XI2_MT;
|
| -#else
|
| - int major = 2, minor = 0;
|
| -#endif
|
| + int major = 2, minor = 2;
|
| if (XIQueryVersion(display, &major, &minor) == BadRequest) {
|
| DVLOG(1) << "XInput2 not supported in the server.";
|
| return false;
|
| }
|
| -#if defined(USE_XI2_MT)
|
| - if (major < 2 || (major == 2 && minor < USE_XI2_MT)) {
|
| + if (major < 2 || (major == 2 && minor < 2)) {
|
| DVLOG(1) << "XI version on server is " << major << "." << minor << ". "
|
| - << "But 2." << USE_XI2_MT << " is required.";
|
| + << "But 2.2 is required.";
|
| return false;
|
| }
|
| -#endif
|
|
|
| return true;
|
| }
|
|
|