Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(643)

Side by Side Diff: ash/ash.gyp

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rework Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 'system/win/audio/tray_audio_delegate_win.cc', 517 'system/win/audio/tray_audio_delegate_win.cc',
518 'system/win/audio/tray_audio_delegate_win.h', 518 'system/win/audio/tray_audio_delegate_win.h',
519 'system/win/audio/tray_audio_win.cc', 519 'system/win/audio/tray_audio_win.cc',
520 'system/win/audio/tray_audio_win.h', 520 'system/win/audio/tray_audio_win.h',
521 'touch/touch_hud_debug.cc', 521 'touch/touch_hud_debug.cc',
522 'touch/touch_hud_debug.h', 522 'touch/touch_hud_debug.h',
523 'touch/touch_hud_projection.cc', 523 'touch/touch_hud_projection.cc',
524 'touch/touch_hud_projection.h', 524 'touch/touch_hud_projection.h',
525 'touch/touch_observer_hud.cc', 525 'touch/touch_observer_hud.cc',
526 'touch/touch_observer_hud.h', 526 'touch/touch_observer_hud.h',
527 'touch/touch_transformer_controller.cc',
528 'touch/touch_transformer_controller.h',
527 'touch/touch_uma.cc', 529 'touch/touch_uma.cc',
528 'touch/touch_uma.h', 530 'touch/touch_uma.h',
529 'volume_control_delegate.h', 531 'volume_control_delegate.h',
530 'wm/app_list_controller.cc', 532 'wm/app_list_controller.cc',
531 'wm/app_list_controller.h', 533 'wm/app_list_controller.h',
532 'wm/always_on_top_controller.cc', 534 'wm/always_on_top_controller.cc',
533 'wm/always_on_top_controller.h', 535 'wm/always_on_top_controller.h',
534 'wm/ash_native_cursor_manager.cc', 536 'wm/ash_native_cursor_manager.cc',
535 'wm/ash_native_cursor_manager.h', 537 'wm/ash_native_cursor_manager.h',
536 'wm/ash_focus_rules.cc', 538 'wm/ash_focus_rules.cc',
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 'msvs_disabled_warnings': [ 4267, ], 703 'msvs_disabled_warnings': [ 4267, ],
702 }], 704 }],
703 ['use_x11!=1', { 705 ['use_x11!=1', {
704 'sources/': [ 706 'sources/': [
705 ['exclude', 'accelerators/key_hold_detector.cc'], 707 ['exclude', 'accelerators/key_hold_detector.cc'],
706 ['exclude', 'accelerators/key_hold_detector.h'], 708 ['exclude', 'accelerators/key_hold_detector.h'],
707 ['exclude', 'accelerators/magnifier_key_scroller.cc'], 709 ['exclude', 'accelerators/magnifier_key_scroller.cc'],
708 ['exclude', 'accelerators/magnifier_key_scroller.h'], 710 ['exclude', 'accelerators/magnifier_key_scroller.h'],
709 ['exclude', 'accelerators/spoken_feedback_toggler.cc'], 711 ['exclude', 'accelerators/spoken_feedback_toggler.cc'],
710 ['exclude', 'accelerators/spoken_feedback_toggler.h'], 712 ['exclude', 'accelerators/spoken_feedback_toggler.h'],
713 ['exclude', 'touch/touch_transformer_controller.cc'],
714 ['exclude', 'touch/touch_transformer_controller.h'],
711 ], 715 ],
712 }, { # else: use_x11==1 716 }, { # else: use_x11==1
713 'dependencies': [ 717 'dependencies': [
714 '../build/linux/system.gyp:xfixes', 718 '../build/linux/system.gyp:xfixes',
715 ], 719 ],
716 }], 720 }],
717 ['chromeos==1', { 721 ['chromeos==1', {
718 'dependencies': [ 722 'dependencies': [
719 '../chromeos/chromeos.gyp:chromeos', 723 '../chromeos/chromeos.gyp:chromeos',
720 # Ash #includes power_supply_properties.pb.h directly. 724 # Ash #includes power_supply_properties.pb.h directly.
721 '../chromeos/chromeos.gyp:power_manager_proto', 725 '../chromeos/chromeos.gyp:power_manager_proto',
722 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 726 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
723 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', 727 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
724 '../ui/display/display.gyp:display', 728 '../ui/display/display.gyp:display',
725 '../ui/display/display.gyp:display_util', 729 '../ui/display/display.gyp:display_util',
726 ], 730 ],
727 }, { # else: chromeos!=1 731 }, { # else: chromeos!=1
728 'sources/': [ 732 'sources/': [
729 ['exclude', 'display/display_configurator_animation.cc'], 733 ['exclude', 'display/display_configurator_animation.cc'],
730 ['exclude', 'display/display_configurator_animation.h'], 734 ['exclude', 'display/display_configurator_animation.h'],
731 ['exclude', 'display/resolution_notification_controller.cc'], 735 ['exclude', 'display/resolution_notification_controller.cc'],
732 ['exclude', 'display/resolution_notification_controller.h'], 736 ['exclude', 'display/resolution_notification_controller.h'],
737 ['exclude', 'touch/touch_transformer_controller.cc'],
738 ['exclude', 'touch/touch_transformer_controller.h'],
733 ], 739 ],
734 }], 740 }],
735 ], 741 ],
736 }, 742 },
737 { 743 {
738 'target_name': 'ash_with_content', 744 'target_name': 'ash_with_content',
739 'type': '<(component)', 745 'type': '<(component)',
740 'dependencies': [ 746 'dependencies': [
741 '../base/base.gyp:base', 747 '../base/base.gyp:base',
742 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 748 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 'system/date/date_view_unittest.cc', 996 'system/date/date_view_unittest.cc',
991 'system/overview/overview_button_tray_unittest.cc', 997 'system/overview/overview_button_tray_unittest.cc',
992 'system/tray/system_tray_unittest.cc', 998 'system/tray/system_tray_unittest.cc',
993 'system/tray/tray_details_view_unittest.cc', 999 'system/tray/tray_details_view_unittest.cc',
994 'system/user/tray_user_unittest.cc', 1000 'system/user/tray_user_unittest.cc',
995 'system/web_notification/web_notification_tray_unittest.cc', 1001 'system/web_notification/web_notification_tray_unittest.cc',
996 'test/ash_test_helper_unittest.cc', 1002 'test/ash_test_helper_unittest.cc',
997 'test/ash_unittests.cc', 1003 'test/ash_unittests.cc',
998 'tooltips/tooltip_controller_unittest.cc', 1004 'tooltips/tooltip_controller_unittest.cc',
999 'touch/touch_observer_hud_unittest.cc', 1005 'touch/touch_observer_hud_unittest.cc',
1006 'touch/touch_transformer_controller_unittest.cc',
1000 'wm/app_list_controller_unittest.cc', 1007 'wm/app_list_controller_unittest.cc',
1001 'wm/ash_native_cursor_manager_unittest.cc', 1008 'wm/ash_native_cursor_manager_unittest.cc',
1002 'wm/dock/docked_window_layout_manager_unittest.cc', 1009 'wm/dock/docked_window_layout_manager_unittest.cc',
1003 'wm/dock/docked_window_resizer_unittest.cc', 1010 'wm/dock/docked_window_resizer_unittest.cc',
1004 'wm/drag_window_resizer_unittest.cc', 1011 'wm/drag_window_resizer_unittest.cc',
1005 'wm/gestures/overview_gesture_handler_unittest.cc', 1012 'wm/gestures/overview_gesture_handler_unittest.cc',
1006 'wm/immersive_fullscreen_controller_unittest.cc', 1013 'wm/immersive_fullscreen_controller_unittest.cc',
1007 'wm/lock_state_controller_unittest.cc', 1014 'wm/lock_state_controller_unittest.cc',
1008 'wm/maximize_mode/accelerometer_test_data_literals.cc', 1015 'wm/maximize_mode/accelerometer_test_data_literals.cc',
1009 'wm/maximize_mode/maximize_mode_controller_unittest.cc', 1016 'wm/maximize_mode/maximize_mode_controller_unittest.cc',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 }], 1071 }],
1065 ['OS=="win" and win_use_allocator_shim==1', { 1072 ['OS=="win" and win_use_allocator_shim==1', {
1066 'dependencies': [ 1073 'dependencies': [
1067 '../base/allocator/allocator.gyp:allocator', 1074 '../base/allocator/allocator.gyp:allocator',
1068 ], 1075 ],
1069 }], 1076 }],
1070 ['use_x11!=1', { 1077 ['use_x11!=1', {
1071 'sources/': [ 1078 'sources/': [
1072 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], 1079 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
1073 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], 1080 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
1081 ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
1074 ], 1082 ],
1075 }], 1083 }],
1076 ['chromeos==1', { 1084 ['chromeos==1', {
1077 'dependencies': [ 1085 'dependencies': [
1078 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', 1086 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
1079 '../chromeos/chromeos.gyp:power_manager_proto', 1087 '../chromeos/chromeos.gyp:power_manager_proto',
1080 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1088 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1081 '../ui/display/display.gyp:display', 1089 '../ui/display/display.gyp:display',
1082 '../ui/display/display.gyp:display_test_util', 1090 '../ui/display/display.gyp:display_test_util',
1083 '../ui/display/display.gyp:display_types', 1091 '../ui/display/display.gyp:display_types',
1084 ], 1092 ],
1085 'sources': [ 1093 'sources': [
1086 'first_run/first_run_helper_unittest.cc', 1094 'first_run/first_run_helper_unittest.cc',
1087 ], 1095 ],
1088 }, { # else: chromeos!=1 1096 }, { # else: chromeos!=1
1089 'sources/': [ 1097 'sources/': [
1090 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1098 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1099 ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
1091 ], 1100 ],
1092 }], 1101 }],
1093 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 1102 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
1094 ['OS=="linux" and component=="shared_library" and ((use_allocator!="none " and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" a nd linux_use_tcmalloc==1))', { 1103 ['OS=="linux" and component=="shared_library" and ((use_allocator!="none " and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" a nd linux_use_tcmalloc==1))', {
1095 'dependencies': [ 1104 'dependencies': [
1096 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 1105 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
1097 ], 1106 ],
1098 'link_settings': { 1107 'link_settings': {
1099 'ldflags': ['-rdynamic'], 1108 'ldflags': ['-rdynamic'],
1100 }, 1109 },
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 }], 1197 }],
1189 ['chromeos==1', { 1198 ['chromeos==1', {
1190 'dependencies': [ 1199 'dependencies': [
1191 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1200 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1192 ], 1201 ],
1193 }], 1202 }],
1194 ], 1203 ],
1195 }, 1204 },
1196 ], 1205 ],
1197 } 1206 }
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_change_observer_chromeos.cc » ('j') | ui/aura/window_tree_host_x11.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698