summaryrefslogtreecommitdiffstats
path: root/views/events
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-28 14:42:48 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-28 14:42:48 +0000
commit5e9ac87a7b7c27893f8f463f9aeda8b51ae37dad (patch)
tree3ead7c2b7127adc9d47223d48c876f956851f0b2 /views/events
parentc4996f76eb3298229264f2402aeb62f56f8f4790 (diff)
downloadchromium_src-5e9ac87a7b7c27893f8f463f9aeda8b51ae37dad.zip
chromium_src-5e9ac87a7b7c27893f8f463f9aeda8b51ae37dad.tar.gz
chromium_src-5e9ac87a7b7c27893f8f463f9aeda8b51ae37dad.tar.bz2
Fix clang bot.
BUG=clang bot TEST=none TBR=sky@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/events')
-rw-r--r--views/events/event_x.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/events/event_x.cc b/views/events/event_x.cc
index 1849728..23c0690 100644
--- a/views/events/event_x.cc
+++ b/views/events/event_x.cc
@@ -245,14 +245,14 @@ uint16 GetCharacterFromXKeyEvent(XKeyEvent* key) {
result.length() == 1) ? result[0] : 0;
}
+#if defined(HAVE_XINPUT2)
float GetTouchParamFromXEvent(XEvent* xev,
TouchFactory::TouchParam tp,
float default_value) {
-#if defined(HAVE_XINPUT2)
TouchFactory::GetInstance()->ExtractTouchParam(*xev, tp, &default_value);
-#endif
return default_value;
}
+#endif
float GetTouchForceFromXEvent(XEvent* xev) {
float force = 0.0;