Unified touch_device_aurax11 and touch_device_ozone.

ui/base/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 261 matching lines @@
     "win/window_event_target.h",
     "window_open_disposition.cc",
     "window_open_disposition.h",
     "work_area_watcher_observer.h",
   ]
 
   if (is_win) {
     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" ]
   }
 
   defines = [ "UI_BASE_IMPLEMENTATION" ]
 
   public_deps = [
     "//base",
     "//skia",
@@ skipping 617 matching lines @@
 # TODO(GYP) Mac (ui_base_tests_bundle)
 if (is_android) {
   unittest_apk("ui_base_unittests_apk") {
     unittests_dep = ":ui_base_unittests"
     deps = [
       ":ui_base_unittests",
       "//chrome:resources",
     ]
   }
 }