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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/touch/touch_device_linux.cc

Issue 815983003: Unified touch_device_aurax11 and touch_device_ozone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified the gyp rule. Created 5 years, 11 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
« ui/base/BUILD.gn ('K') | « ui/base/touch/touch_device_aurax11.cc ('k') | ui/base/touch/touch_device_ozone.cc » ('j') | ui/base/ui_base.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/touch/touch_device_linux.cc
diff --git a/ui/base/touch/touch_device_aurax11.cc b/ui/base/touch/touch_device_linux.cc
similarity index 98%
rename from ui/base/touch/touch_device_aurax11.cc
rename to ui/base/touch/touch_device_linux.cc
index 723fb0a0fd1fa93997055d84c31bc2ddb5981128..e0e7948316668cb52e8cce3134fc11e1bf044ad1 100644
--- a/ui/base/touch/touch_device_aurax11.cc
+++ b/ui/base/touch/touch_device_linux.cc
@@ -14,7 +14,7 @@ bool IsTouchDevicePresent() {
}
int MaxTouchPoints() {
- int max_touch = -1;
+ int max_touch = 0;
const std::vector<ui::TouchscreenDevice>& touchscreen_devices =
ui::DeviceDataManager::GetInstance()->touchscreen_devices();
for (const ui::TouchscreenDevice& device : touchscreen_devices) {
« ui/base/BUILD.gn ('K') | « ui/base/touch/touch_device_aurax11.cc ('k') | ui/base/touch/touch_device_ozone.cc » ('j') | ui/base/ui_base.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698