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

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: Created 6 years 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/touch/touch_device_linux.cc ('K') | « ui/base/touch/touch_device_ozone.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index c3b430db2657763d05b2ac4810fab2b56290326e..fd344ff93c6f8468ccc00fb63d128aa67be62c8f 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',
@@ -532,7 +531,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 »

Powered by Google App Engine
This is Rietveld 408576698