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

Side by Side Diff: ash/ash.gyp

Issue 147033003: Move some non-unittest files to compositor_test_support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac compile Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 'keyboard_overlay/keyboard_overlay_view.h', 699 'keyboard_overlay/keyboard_overlay_view.h',
700 ], 700 ],
701 }, 701 },
702 { 702 {
703 'target_name': 'ash_test_support', 703 'target_name': 'ash_test_support',
704 'type': 'static_library', 704 'type': 'static_library',
705 'dependencies': [ 705 'dependencies': [
706 '../skia/skia.gyp:skia', 706 '../skia/skia.gyp:skia',
707 '../testing/gtest.gyp:gtest', 707 '../testing/gtest.gyp:gtest',
708 '../ui/app_list/app_list.gyp:app_list_test_support', 708 '../ui/app_list/app_list.gyp:app_list_test_support',
709 '../ui/views/views.gyp:views_test_support',
709 'ash', 710 'ash',
710 'ash_resources', 711 'ash_resources',
711 ], 712 ],
712 'sources': [ 713 'sources': [
713 'shell/keyboard_controller_proxy_stub.cc', 714 'shell/keyboard_controller_proxy_stub.cc',
714 'shell/keyboard_controller_proxy_stub.h', 715 'shell/keyboard_controller_proxy_stub.h',
715 'shell/toplevel_window.cc', 716 'shell/toplevel_window.cc',
716 'shell/toplevel_window.h', 717 'shell/toplevel_window.h',
717 'test/app_list_controller_test_api.cc', 718 'test/app_list_controller_test_api.cc',
718 'test/app_list_controller_test_api.h', 719 'test/app_list_controller_test_api.h',
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 '../content/content.gyp:content_browser', 786 '../content/content.gyp:content_browser',
786 '../content/content_shell_and_tests.gyp:test_support_content', 787 '../content/content_shell_and_tests.gyp:test_support_content',
787 '../skia/skia.gyp:skia', 788 '../skia/skia.gyp:skia',
788 '../testing/gtest.gyp:gtest', 789 '../testing/gtest.gyp:gtest',
789 '../third_party/icu/icu.gyp:icui18n', 790 '../third_party/icu/icu.gyp:icui18n',
790 '../third_party/icu/icu.gyp:icuuc', 791 '../third_party/icu/icu.gyp:icuuc',
791 '../ui/app_list/app_list.gyp:app_list', 792 '../ui/app_list/app_list.gyp:app_list',
792 '../ui/aura/aura.gyp:aura', 793 '../ui/aura/aura.gyp:aura',
793 '../ui/aura/aura.gyp:aura_test_support', 794 '../ui/aura/aura.gyp:aura_test_support',
794 '../ui/compositor/compositor.gyp:compositor', 795 '../ui/compositor/compositor.gyp:compositor',
796 '../ui/compositor/compositor.gyp:compositor_test_support',
795 '../ui/events/events.gyp:events', 797 '../ui/events/events.gyp:events',
796 '../ui/events/events.gyp:events_test_support', 798 '../ui/events/events.gyp:events_test_support',
797 '../ui/gfx/gfx.gyp:gfx', 799 '../ui/gfx/gfx.gyp:gfx',
798 '../ui/gfx/gfx.gyp:gfx_geometry', 800 '../ui/gfx/gfx.gyp:gfx_geometry',
799 '../ui/keyboard/keyboard.gyp:keyboard', 801 '../ui/keyboard/keyboard.gyp:keyboard',
800 '../ui/message_center/message_center.gyp:message_center', 802 '../ui/message_center/message_center.gyp:message_center',
801 '../ui/message_center/message_center.gyp:message_center_test_support', 803 '../ui/message_center/message_center.gyp:message_center_test_support',
802 '../ui/resources/ui_resources.gyp:ui_resources', 804 '../ui/resources/ui_resources.gyp:ui_resources',
803 '../ui/ui.gyp:ui', 805 '../ui/ui.gyp:ui',
804 '../ui/ui_unittests.gyp:ui_test_support', 806 '../ui/ui_unittests.gyp:ui_test_support',
805 '../ui/views/views.gyp:views', 807 '../ui/views/views.gyp:views',
806 '../ui/views/views.gyp:views_examples_with_content_lib', 808 '../ui/views/views.gyp:views_examples_with_content_lib',
807 '../ui/views/views.gyp:views_test_support', 809 '../ui/views/views.gyp:views_test_support',
808 '../ui/views/views.gyp:views_with_content_test_support', 810 '../ui/views/views.gyp:views_with_content_test_support',
809 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', 811 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
810 '../url/url.gyp:url_lib', 812 '../url/url.gyp:url_lib',
811 'ash_strings.gyp:ash_strings', 813 'ash_strings.gyp:ash_strings',
812 'ash', 814 'ash',
813 'ash_resources', 815 'ash_resources',
814 'ash_test_support', 816 'ash_test_support',
815 'ash_with_content', 817 'ash_with_content',
816 ], 818 ],
817 'sources': [ 819 'sources': [
818 '../ui/compositor/test/layer_animator_test_controller.cc',
819 '../ui/compositor/test/layer_animator_test_controller.h',
820 '../ui/views/test/test_views_delegate.cc',
821 '../ui/views/test/test_views_delegate.h',
822 'accelerators/accelerator_commands_unittest.cc', 820 'accelerators/accelerator_commands_unittest.cc',
823 'accelerators/accelerator_controller_unittest.cc', 821 'accelerators/accelerator_controller_unittest.cc',
824 'accelerators/accelerator_filter_unittest.cc', 822 'accelerators/accelerator_filter_unittest.cc',
825 'accelerators/accelerator_table_unittest.cc', 823 'accelerators/accelerator_table_unittest.cc',
826 'accelerators/nested_dispatcher_controller_unittest.cc', 824 'accelerators/nested_dispatcher_controller_unittest.cc',
827 'autoclick/autoclick_unittest.cc', 825 'autoclick/autoclick_unittest.cc',
828 'desktop_background/desktop_background_controller_unittest.cc', 826 'desktop_background/desktop_background_controller_unittest.cc',
829 'desktop_background/wallpaper_resizer_unittest.cc', 827 'desktop_background/wallpaper_resizer_unittest.cc',
830 'dip_unittest.cc', 828 'dip_unittest.cc',
831 'display/display_change_observer_chromeos_unittest.cc', 829 'display/display_change_observer_chromeos_unittest.cc',
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 }, 1076 },
1079 }, 1077 },
1080 'dependencies': [ 1078 'dependencies': [
1081 '../sandbox/sandbox.gyp:sandbox', 1079 '../sandbox/sandbox.gyp:sandbox',
1082 ], 1080 ],
1083 }], 1081 }],
1084 ], 1082 ],
1085 }, 1083 },
1086 ], 1084 ],
1087 } 1085 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698