Unified touch_device_aurax11 and touch_device_ozone.

ui/base/BUILD.gn

Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 6b034af05dbf4b99da72e6815079ea03baddd115..565630fc7ffaa1d7a53c6784ae924a46708bb4e4 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -279,10 +279,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 (is_linux || use_ozone || (use_aura && use_x11)) {

[sadrul, 2015/01/20 18:44:07]

Just 'is_linux' should be sufficient (use_ozone is supported only on linux, and
so is use_x11)

[mustaq, 2015/01/21 17:07:35]

Done.

+    sources += [ "touch/touch_device_linux.cc" ]
   } else {
     # Empty implementation for all other cases.
     sources += [ "touch/touch_device.cc" ]