Merge 270252 "Re-land "Move touch CTM from X into Chrome""

ash/ash.gyp

 # Copyright (c) 2012 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,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
@@ skipping 501 matching lines @@
         'system/win/audio/tray_audio_delegate_win.cc',
         'system/win/audio/tray_audio_delegate_win.h',
         'system/win/audio/tray_audio_win.cc',
         'system/win/audio/tray_audio_win.h',
         'touch/touch_hud_debug.cc',
         'touch/touch_hud_debug.h',
         'touch/touch_hud_projection.cc',
         'touch/touch_hud_projection.h',
         'touch/touch_observer_hud.cc',
         'touch/touch_observer_hud.h',
+        'touch/touch_transformer_controller.cc',
+        'touch/touch_transformer_controller.h',
         'touch/touch_uma.cc',
         'touch/touch_uma.h',
         'volume_control_delegate.h',
         'wm/app_list_controller.cc',
         'wm/app_list_controller.h',
         'wm/always_on_top_controller.cc',
         'wm/always_on_top_controller.h',
         'wm/ash_native_cursor_manager.cc',
         'wm/ash_native_cursor_manager.h',
         'wm/ash_focus_rules.cc',
@@ skipping 161 matching lines @@
           'msvs_disabled_warnings': [ 4267, ],
         }],
         ['use_x11!=1', {
           'sources/': [
             ['exclude', 'accelerators/key_hold_detector.cc'],
             ['exclude', 'accelerators/key_hold_detector.h'],
             ['exclude', 'accelerators/magnifier_key_scroller.cc'],
             ['exclude', 'accelerators/magnifier_key_scroller.h'],
             ['exclude', 'accelerators/spoken_feedback_toggler.cc'],
             ['exclude', 'accelerators/spoken_feedback_toggler.h'],
+            ['exclude', 'touch/touch_transformer_controller.cc'],
+            ['exclude', 'touch/touch_transformer_controller.h'],
           ],
         }, { # else: use_x11==1
           'dependencies': [
             '../build/linux/system.gyp:xfixes',
            ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos',
             # Ash #includes power_supply_properties.pb.h directly.
             '../chromeos/chromeos.gyp:power_manager_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
             '../ui/display/display.gyp:display',
             '../ui/display/display.gyp:display_util',
           ],
         }, { # else: chromeos!=1
           'sources/': [
             ['exclude', 'display/display_configurator_animation.cc'],
             ['exclude', 'display/display_configurator_animation.h'],
             ['exclude', 'display/resolution_notification_controller.cc'],
             ['exclude', 'display/resolution_notification_controller.h'],
             ['exclude', 'system/tray/media_security/media_capture_observer.h'],
             ['exclude', 'system/tray/media_security/multi_profile_media_tray_item.cc'],
             ['exclude', 'system/tray/media_security/multi_profile_media_tray_item.h'],
+            ['exclude', 'touch/touch_transformer_controller.cc'],
+            ['exclude', 'touch/touch_transformer_controller.h'],
           ],
         }],
       ],
     },
     {
       'target_name': 'ash_with_content',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ skipping 228 matching lines @@
         'system/overview/overview_button_tray_unittest.cc',
         'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
         'system/tray/system_tray_unittest.cc',
         'system/tray/tray_details_view_unittest.cc',
         'system/user/tray_user_unittest.cc',
         'system/web_notification/web_notification_tray_unittest.cc',
         'test/ash_test_helper_unittest.cc',
         'test/ash_unittests.cc',
         'tooltips/tooltip_controller_unittest.cc',
         'touch/touch_observer_hud_unittest.cc',
+        'touch/touch_transformer_controller_unittest.cc',
         'wm/app_list_controller_unittest.cc',
         'wm/ash_native_cursor_manager_unittest.cc',
         'wm/dock/docked_window_layout_manager_unittest.cc',
         'wm/dock/docked_window_resizer_unittest.cc',
         'wm/drag_window_resizer_unittest.cc',
         'wm/gestures/overview_gesture_handler_unittest.cc',
         'wm/immersive_fullscreen_controller_unittest.cc',
         'wm/lock_state_controller_unittest.cc',
         'wm/maximize_mode/accelerometer_test_data_literals.cc',
         'wm/maximize_mode/maximize_mode_controller_unittest.cc',
@@ skipping 54 matching lines @@
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
         ['use_x11!=1', {
           'sources/': [
             ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
             ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
+            ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
             '../chromeos/chromeos.gyp:power_manager_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../ui/display/display.gyp:display',
             '../ui/display/display.gyp:display_test_util',
             '../ui/display/display.gyp:display_types',
           ],
           'sources': [
             'first_run/first_run_helper_unittest.cc',
           ],
         }, { # else: chromeos!=1
           'sources/': [
             ['exclude', 'display/resolution_notification_controller_unittest.cc'],
+            ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
           ],
         }],
         ['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
           'dependencies': [
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
           'link_settings': {
             'ldflags': ['-rdynamic'],
           },
         }],
@@ skipping 111 matching lines @@
         'ash_shell_lib',
         'ash_test_support',
       ],
       'sources': [
         'shell/window_watcher_unittest.cc',
         'test/ash_unittests.cc',
       ],
     },
   ],
 }