touch: Always expect XInput2 availability.

chrome/common/chrome_switches.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 1111 matching lines @@
 // Enable Kiosk mode.
 const char kKioskMode[]                     = "kiosk";
 #endif
 
 // Enables debug paint in views framework. Enabling this causes the damaged
 // region being painted to flash in red.
 #if defined(TOOLKIT_VIEWS)
 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
 // Clear the token service before using it.  This allows simulating
 // the expiration of credentials during testing.
 const char kClearTokenService[]             = "clear-token-service";
 
 // Sets a token in the token service, for testing.
 const char kSetToken[]                      = "set-token";
 
 // Debug only switch to specify which websocket live experiment host to be used.
 // If host is specified, it also makes initial delay shorter (5 min to 5 sec)
 // to make it faster to test websocket live experiment code.
 const char kWebSocketLiveExperimentHost[]   = "websocket-live-experiment-host";
 
 // Debug only switch to give access to all private extension APIs to
 // any non-component extension that is requesting it.
 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";
 
 bool IsPrintPreviewEnabled() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(kDisablePrintPreview);
 }
 #else
 // Enable print preview (no PDF viewer, thus not supported with Chromium).
 const char kEnablePrintPreview[]            = "enable-print-preview";
 
 bool IsPrintPreviewEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(kEnablePrintPreview);
 }
 #endif
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead,
 // please put them in alphabetical order above, or in order inside the
 // appropriate ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches