ui/base/touch/touch_device_linux.cc - Issue 815983003: Unified touch_device_aurax11 and touch_device_ozone.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebased with master 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

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 96%

rename from ui/base/touch/touch_device_aurax11.cc

rename to ui/base/touch/touch_device_linux.cc

index 723fb0a0fd1fa93997055d84c31bc2ddb5981128..cc9d7d5f94f3fc6d7b13a01cbb770e49c85b4f2d 100644

--- a/ui/base/touch/touch_device_aurax11.cc

+++ b/ui/base/touch/touch_device_linux.cc

@@ -10,11 +10,12 @@

namespace ui {

bool IsTouchDevicePresent() {

+ // TODO(sadrul@chromium.org): Support evdev hotplugging.

sadrul 2015/01/15 22:07:50 We don't need this TODO anymore. You can remove th

mustaq 2015/01/20 15:03:50 Done.

return ui::DeviceDataManager::GetInstance()->touchscreen_devices().size() > 0;

}

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) {

« no previous file with comments | « ui/base/touch/touch_device_aurax11.cc ('k') | ui/base/touch/touch_device_ozone.cc » ('j') | no next file with comments »