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

Unified Diff: chrome/browser/chromeos/frame/panel_controller.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/chromeos/frame/panel_controller.cc
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index 2e82b3af02cd2f551502394110ef7b8b90e8aaaa..eccc30ce426d6edb4b0c127b0a3ef86e4ba418f6 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -6,10 +6,8 @@
#if defined(TOUCH_UI)
#include <X11/Xlib.h>
-#if defined(HAVE_XINPUT2)
#include <X11/extensions/XInput2.h>
#endif
-#endif
#include <vector>
@@ -49,7 +47,6 @@ gfx::Point RootLocationFromXEvent(const XEvent* xev) {
case MotionNotify:
return gfx::Point(xev->xmotion.x_root, xev->xmotion.y_root);
-#if defined(HAVE_XINPUT2)
case GenericEvent: {
const XIDeviceEvent* xiev =
static_cast<XIDeviceEvent*>(xev->xcookie.data);
@@ -61,7 +58,6 @@ gfx::Point RootLocationFromXEvent(const XEvent* xev) {
static_cast<int>(xiev->root_y));
}
}
-#endif // defined(HAVE_XINPUT2)
default:
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698