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

Unified Diff: ui/base/BUILD.gn

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
« no previous file with comments | « no previous file | ui/base/touch/touch_device_aurax11.cc » ('j') | ui/base/touch/touch_device_linux.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index bf13973bca2f04ab6a634432d0c24484714926fe..d2d9cbad324babc27cc163fe55392386ac8d44d9 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -276,10 +276,8 @@ component("base") {
sources += [ "touch/touch_device_win.cc" ]
} else if (is_android) {
sources += [ "touch/touch_device_android.cc" ]
- } else if (use_ozone) {
- sources += [ "touch/touch_device_ozone.cc" ]
- } else if (use_aura && use_x11) {
- sources += [ "touch/touch_device_aurax11.cc" ]
+ } else if (use_ozone || (use_aura && use_x11)) {
+ sources += [ "touch/touch_device_linux.cc" ]
} else {
# Empty implementation for all other cases.
sources += [ "touch/touch_device.cc" ]
« no previous file with comments | « no previous file | ui/base/touch/touch_device_aurax11.cc » ('j') | ui/base/touch/touch_device_linux.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698