ui/base/ui_base.gyp - 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/ui_base.gyp

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/ui_base.gyp

diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp

index 1c8af2cb55710ee7604d1693bff1ecede13f6696..054faca315b1e2a88f0c925e7ca0ba1ae025e4de 100644

--- a/ui/base/ui_base.gyp

+++ b/ui/base/ui_base.gyp

@@ -352,8 +352,7 @@

'touch/touch_device.cc',

'touch/touch_device.h',

'touch/touch_device_android.cc',

- 'touch/touch_device_aurax11.cc',

- 'touch/touch_device_ozone.cc',

+ 'touch/touch_device_linux.cc',

'touch/touch_device_win.cc',

'touch/touch_editing_controller.cc',

'touch/touch_editing_controller.h',

@@ -536,7 +535,7 @@

'sources!': [

'dragdrop/os_exchange_data_provider_aura.cc',

'dragdrop/os_exchange_data_provider_aura.h',

- 'touch/touch_device_aurax11.cc',

+ 'touch/touch_device_linux.cc',

}],

['OS=="win"', {

« ui/base/touch/touch_device_linux.cc ('K') | « ui/base/touch/touch_device_ozone.cc ('k') | no next file » | no next file with comments »