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

Unified Diff: chrome/browser/ui/browser_init.cc

Issue 6975045: touch: Always expect XInput2 availability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 9 years, 7 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
Index: chrome/browser/ui/browser_init.cc
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index d29f756cededb0e19b5be8a07f0f374f8c7bd0af..5c37e655afa738ec54c7b067dbb775d09a3ae272 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -98,7 +98,7 @@
#include "chrome/browser/chromeos/wm_message_listener.h"
#endif
-#if defined(HAVE_XINPUT2)
+#if defined(TOUCH_UI)
#include "views/focus/accelerator_handler.h"
#endif
@@ -1377,7 +1377,7 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line,
}
#endif
-#if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
// Get a list of pointer-devices that should be treated as touch-devices.
// TODO(sad): Instead of/in addition to getting the list from the
// command-line, query X for a list of touch devices.

Powered by Google App Engine
This is Rietveld 408576698