touch: Always expect XInput2 availability.

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index ef672400a120eff6c8da619ce6082b3db266272b..f47f3f40ab1d57908c0b50983c7a1fe63efcd03e 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1129,10 +1129,15 @@ const char kKioskMode[]                     = "kiosk";
 const char kDebugViewsPaint[]               = "debug-views-paint";
 #endif
 
+#if defined(TOUCH_UI)
 // Debug only switch to prevent the mouse cursor from disappearing when
 // touch is enabled
-#if defined(TOUCH_UI)
 const char kKeepMouseCursor[]               = "keep-mouse-cursor";
+
+// Tells chrome to interpret events from these devices as touch events. Only
+// available with XInput 2 (i.e. X server 1.8 or above). The id's of the devices
+// can be retrieved from 'xinput list'.
+const char kTouchDevices[]                  = "touch-devices";
 #endif
 
 #ifndef NDEBUG
@@ -1153,13 +1158,6 @@ const char kWebSocketLiveExperimentHost[]   = "websocket-live-experiment-host";
 const char kExposePrivateExtensionApi[]   = "expose-private-extension-api";
 #endif
 
-#if defined(HAVE_XINPUT2)
-// Tells chrome to interpret events from these devices as touch events. Only
-// available with XInput 2 (i.e. X server 1.8 or above). The id's of the devices
-// can be retrieved from 'xinput list'.
-const char kTouchDevices[]                  = "touch-devices";
-#endif
-
 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
 // Disable print preview (Not exposed via about:flags. Only used for testing.)
 const char kDisablePrintPreview[]           = "disable-print-preview";