| Index: ash/ash.gyp
|
| diff --git a/ash/ash.gyp b/ash/ash.gyp
|
| index 4934087b90f205afca0c40b186533fcf773cd63b..d1392605184b626f144ecd8c9ec880a9d6b03d7a 100644
|
| --- a/ash/ash.gyp
|
| +++ b/ash/ash.gyp
|
| @@ -524,6 +524,8 @@
|
| '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',
|
| @@ -706,6 +708,8 @@
|
| ['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': [
|
| @@ -728,6 +732,8 @@
|
| ['exclude', 'display/display_configurator_animation.h'],
|
| ['exclude', 'display/resolution_notification_controller.cc'],
|
| ['exclude', 'display/resolution_notification_controller.h'],
|
| + ['exclude', 'touch/touch_transformer_controller.cc'],
|
| + ['exclude', 'touch/touch_transformer_controller.h'],
|
| ],
|
| }],
|
| ],
|
| @@ -995,6 +1001,7 @@
|
| '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',
|
| @@ -1069,6 +1076,7 @@
|
| 'sources/': [
|
| ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
|
| ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
|
| + ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
|
| ],
|
| }],
|
| ['chromeos==1', {
|
| @@ -1086,6 +1094,7 @@
|
| }, { # else: chromeos!=1
|
| 'sources/': [
|
| ['exclude', 'display/resolution_notification_controller_unittest.cc'],
|
| + ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
|
| ],
|
| }],
|
| # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
|
|