Unified touch_device_aurax11 and touch_device_ozone.

ui/base/ui_base.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 334 matching lines @@
         'resource/resource_handle.h',
         'text/bytes_formatting.cc',
         'text/bytes_formatting.h',
         'theme_provider.cc',
         'theme_provider.h',
         'touch/selection_bound.cc',
         'touch/selection_bound.h',
         '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',
         'touch/touch_enabled.cc',
         'touch/touch_enabled.h',
         'ui_base_export.h',
         'ui_base_exports.cc',
         'ui_base_paths.cc',
         'ui_base_paths.h',
         'ui_base_switches.cc',
@@ skipping 156 matching lines @@
             'clipboard/clipboard_aura.cc',
           ],
         }, {
           'sources!': [
             'clipboard/clipboard_aurax11.cc',
           ],
         }],
         ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
           'sources!': [
             'dragdrop/os_exchange_data_provider_aurax11.cc',
-            'touch/touch_device.cc',
           ],
         }, {
           'sources!': [
             'dragdrop/os_exchange_data_provider_aura.cc',
             'dragdrop/os_exchange_data_provider_aura.h',
-            'touch/touch_device_aurax11.cc',
+          ],
+        }],
+        ['chromeos==1 or OS=="linux"', {

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

I think you can use just 'OS=="linux"' here.

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

Done.

+          'sources!': [
+            'touch/touch_device.cc',
+          ],
+        }, {
+          'sources!': [
+            'touch/touch_device_linux.cc',
           ],
         }],
         ['OS=="win"', {
           'sources!': [
             'touch/touch_device.cc',
           ],
           'include_dirs': [
             '../..',
             '../../third_party/wtl/include',
           ],
@@ skipping 16 matching lines @@
             },
           },
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-ld2d1.lib',
               '-ldwmapi.lib',
               '-loleacc.lib',
             ],
           },
-        },{  # OS!="win"
+        }, {  # OS!="win"
           'conditions': [
             ['use_aura==0', {
               'sources!': [
                 'view_prop.cc',
                 'view_prop.h',
               ],
             }],
           ],
         }],
         ['OS=="mac"', {
@@ skipping 205 matching lines @@
            ],
            'variables': {
              'jni_gen_package': 'ui',
            },
            'includes': [ '../../build/jni_generator.gypi' ],
          },
        ],
     }],
   ],
 }