summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorlanwei <lanwei@chromium.org>2015-07-13 12:54:15 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-13 19:55:06 +0000
commitdb63904ab567209e4318a81d440f183686418b77 (patch)
tree85d5c4ebf3fbc05dbb8786089ca9946aa47dfb87 /ui
parent2c4fd1d7f5ff14c88ef00736b87d8240e3921e30 (diff)
downloadchromium_src-db63904ab567209e4318a81d440f183686418b77.zip
chromium_src-db63904ab567209e4318a81d440f183686418b77.tar.gz
chromium_src-db63904ab567209e4318a81d440f183686418b77.tar.bz2
Small fix for touch screen on Linux with or without flag --touch-devices
This is a small fix, missing a pair of brackets of "if" statement for issue 1186833005: Fix touch screen on Linux with or without flag --touch-devices (https://codereview.chromium.org/1186833005/) BUG=486492 Review URL: https://codereview.chromium.org/1230353002 Cr-Commit-Position: refs/heads/master@{#338553}
Diffstat (limited to 'ui')
-rw-r--r--ui/events/devices/x11/touch_factory_x11.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/events/devices/x11/touch_factory_x11.cc b/ui/events/devices/x11/touch_factory_x11.cc
index bd7b157..3229344 100644
--- a/ui/events/devices/x11/touch_factory_x11.cc
+++ b/ui/events/devices/x11/touch_factory_x11.cc
@@ -128,7 +128,7 @@ void TouchFactory::UpdateDeviceList(Display* display) {
XITouchClassInfo* tci =
reinterpret_cast<XITouchClassInfo*>(xiclassinfo);
// Only care direct touch device (such as touch screen) right now
- if (tci->mode == XIDirectTouch)
+ if (tci->mode == XIDirectTouch) {
CacheTouchscreenIds(devinfo.deviceid);
if (devinfo.use == XISlavePointer) {
device_master_id_list_[devinfo.deviceid] = devinfo.attachment;
@@ -137,6 +137,7 @@ void TouchFactory::UpdateDeviceList(Display* display) {
touch_device_lookup_[devinfo.attachment] = true;
touch_device_list_[devinfo.attachment] = true;
}
+ }
}
}
}