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

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, 5 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 | « chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_init.cc
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index 1060eb55498de1476e5564fc85489e35b4a6dbef..eacbe8e5d1009c1c0b67fd38a8ac11300af50fc0 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
@@ -1393,7 +1393,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.
« no previous file with comments | « chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698