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

Unified Diff: ui/events/x/touch_factory_x11.cc

Issue 49383011: Build fix linux aura without USE_XI2_MT. (Closed) Base URL: https://git.chromium.org/chromium/src.git@ime
Patch Set: Don't use XScopedString Created 7 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/x/touch_factory_x11.cc
diff --git a/ui/events/x/touch_factory_x11.cc b/ui/events/x/touch_factory_x11.cc
index b3cd4dd0617d644c6bcf5849d8a257fe452dd4e9..7472061d3745db8e1b37327475357b26fc5abd93 100644
--- a/ui/events/x/touch_factory_x11.cc
+++ b/ui/events/x/touch_factory_x11.cc
@@ -93,12 +93,13 @@ void TouchFactory::UpdateDeviceList(Display* display) {
DeviceListCacheX::GetInstance()->GetXDeviceList(display);
for (int i = 0; i < dev_list.count; i++) {
if (dev_list[i].type) {
- XScopedString devtype(XGetAtomName(display, dev_list[i].type));
- if (devtype.string() && !strcmp(devtype.string(), XI_TOUCHSCREEN)) {
+ char* devtype = XGetAtomName(display, dev_list[i].type);
+ if (devtype && !strcmp(devtype, XI_TOUCHSCREEN)) {
touch_device_lookup_[dev_list[i].id] = true;
touch_device_list_[dev_list[i].id] = false;
touch_device_available_ = true;
}
+ XFree(devtype);
}
sadrul 2013/10/31 15:30:36 Can you do this like the following instead: dev
}
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698