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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browser_main.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
« build/linux/system.gyp ('K') | « build/linux/system.gyp ('k') | chrome/browser/chromeos/frame/panel_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index f1e05cd20a86594ac4abbc2aec6d57463ee324b3..bc0504d92905c3f324992e4a0410408ee991898a 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -201,7 +201,7 @@
#include "ui/gfx/gtk_util.h"
#endif
-#if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
+#if defined(TOUCH_UI)
#include "views/touchui/touch_factory.h"
#endif
@@ -1783,7 +1783,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
}
#endif
-#if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
+#if defined(TOUCH_UI)
views::TouchFactory::GetInstance()->set_keep_mouse_cursor(
CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepMouseCursor));
#endif
« build/linux/system.gyp ('K') | « build/linux/system.gyp ('k') | chrome/browser/chromeos/frame/panel_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698