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

Side by Side Diff: content/content_tests.gypi

Issue 206923002: Adds plumbing to pass WebUI mojo::Handle from browser to renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add TODO and merge to trunk Created 6 years, 9 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 | « content/content_resources.grd ('k') | content/public/browser/render_view_host.h » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 'test/accessibility_browser_test_utils.cc', 916 'test/accessibility_browser_test_utils.cc',
917 'test/accessibility_browser_test_utils.h', 917 'test/accessibility_browser_test_utils.h',
918 'test/content_browser_test.cc', 918 'test/content_browser_test.cc',
919 'test/content_browser_test.h', 919 'test/content_browser_test.h',
920 'test/content_browser_test_utils.cc', 920 'test/content_browser_test_utils.cc',
921 'test/content_browser_test_utils.h', 921 'test/content_browser_test_utils.h',
922 'test/content_browser_test_utils_mac.mm', 922 'test/content_browser_test_utils_mac.mm',
923 ], 923 ],
924 }, 924 },
925 { 925 {
926 'target_name': 'web_ui_test_mojo_bindings',
927 'type': 'static_library',
928 'dependencies': [
929 '../mojo/mojo.gyp:mojo_bindings',
930 '../mojo/mojo.gyp:mojo_system',
931 ],
932 'sources': [
933 'test/data/web_ui_test_mojo_bindings.mojom',
934 ],
935 # TODO(sky): this shouldn't be necessary. It's working around a bug in
936 # gyp.
937 'variables': {
938 'mojom_base_output_dir': 'content',
939 },
940 'includes': [ '../mojo/public/bindings/mojom_bindings_generator.gypi' ],
941 'export_dependent_settings': [
942 '../mojo/mojo.gyp:mojo_bindings',
943 '../mojo/mojo.gyp:mojo_system',
944 ],
945 },
946 {
926 'target_name': 'content_browsertests', 947 'target_name': 'content_browsertests',
927 'type': '<(gtest_target_type)', 948 'type': '<(gtest_target_type)',
928 'dependencies': [ 949 'dependencies': [
929 'content.gyp:content_common', 950 'content.gyp:content_common',
930 'content.gyp:content_gpu', 951 'content.gyp:content_gpu',
931 'content.gyp:content_plugin', 952 'content.gyp:content_plugin',
932 'content.gyp:content_renderer', 953 'content.gyp:content_renderer',
933 'content_browser_test_support', 954 'content_browser_test_support',
934 'content_resources.gyp:content_resources', 955 'content_resources.gyp:content_resources',
935 'content_shell_lib', 956 'content_shell_lib',
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 'browser/service_worker/service_worker_browsertest.cc', 1041 'browser/service_worker/service_worker_browsertest.cc',
1021 'browser/session_history_browsertest.cc', 1042 'browser/session_history_browsertest.cc',
1022 'browser/site_per_process_browsertest.cc', 1043 'browser/site_per_process_browsertest.cc',
1023 'browser/speech/input_tag_speech_browsertest.cc', 1044 'browser/speech/input_tag_speech_browsertest.cc',
1024 'browser/speech/speech_recognition_browsertest.cc', 1045 'browser/speech/speech_recognition_browsertest.cc',
1025 'browser/tracing/tracing_controller_browsertest.cc', 1046 'browser/tracing/tracing_controller_browsertest.cc',
1026 'browser/web_contents/touch_editable_impl_aura_browsertest.cc', 1047 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
1027 'browser/web_contents/web_contents_impl_browsertest.cc', 1048 'browser/web_contents/web_contents_impl_browsertest.cc',
1028 'browser/web_contents/web_contents_view_aura_browsertest.cc', 1049 'browser/web_contents/web_contents_view_aura_browsertest.cc',
1029 'browser/webkit_browsertest.cc', 1050 'browser/webkit_browsertest.cc',
1051 'browser/webui/web_ui_mojo_browsertest.cc',
1030 'browser/worker_host/test/worker_browsertest.cc', 1052 'browser/worker_host/test/worker_browsertest.cc',
1031 'child/site_isolation_policy_browsertest.cc', 1053 'child/site_isolation_policy_browsertest.cc',
1032 'common/gpu/client/context_provider_command_buffer_browsertest.cc', 1054 'common/gpu/client/context_provider_command_buffer_browsertest.cc',
1033 'renderer/accessibility/renderer_accessibility_browsertest.cc', 1055 'renderer/accessibility/renderer_accessibility_browsertest.cc',
1034 'renderer/browser_plugin/browser_plugin_browsertest.cc', 1056 'renderer/browser_plugin/browser_plugin_browsertest.cc',
1035 'renderer/browser_plugin/browser_plugin_browsertest.h', 1057 'renderer/browser_plugin/browser_plugin_browsertest.h',
1036 'renderer/browser_plugin/mock_browser_plugin.cc', 1058 'renderer/browser_plugin/mock_browser_plugin.cc',
1037 'renderer/browser_plugin/mock_browser_plugin.h', 1059 'renderer/browser_plugin/mock_browser_plugin.h',
1038 'renderer/browser_plugin/mock_browser_plugin_manager.cc', 1060 'renderer/browser_plugin/mock_browser_plugin_manager.cc',
1039 'renderer/browser_plugin/mock_browser_plugin_manager.h', 1061 'renderer/browser_plugin/mock_browser_plugin_manager.h',
(...skipping 16 matching lines...) Expand all
1056 'test/content_browser_test_test.cc', 1078 'test/content_browser_test_test.cc',
1057 'test/content_test_launcher.cc', 1079 'test/content_test_launcher.cc',
1058 'test/webui_resource_browsertest.cc', 1080 'test/webui_resource_browsertest.cc',
1059 ], 1081 ],
1060 'conditions': [ 1082 'conditions': [
1061 ['chromeos==0', { 1083 ['chromeos==0', {
1062 'sources!': [ 1084 'sources!': [
1063 'browser/web_contents/touch_editable_impl_aura_browsertest.cc', 1085 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
1064 ], 1086 ],
1065 }], 1087 }],
1088 ['use_mojo==0', {
1089 'sources!': [
1090 'browser/webui/web_ui_mojo_browsertest.cc',
1091 ],
1092 }, { # use_mojo==1
1093 'dependencies': [
1094 'web_ui_test_mojo_bindings',
1095 '../mojo/mojo.gyp:mojo_bindings',
1096 '../mojo/mojo.gyp:mojo_environment_chromium',
1097 '../mojo/mojo.gyp:mojo_system',
1098 '../mojo/mojo.gyp:mojo_system_impl',
1099 ],
1100 }],
1066 ['OS=="win"', { 1101 ['OS=="win"', {
1067 'resource_include_dirs': [ 1102 'resource_include_dirs': [
1068 '<(SHARED_INTERMEDIATE_DIR)/webkit', 1103 '<(SHARED_INTERMEDIATE_DIR)/webkit',
1069 ], 1104 ],
1070 'sources': [ 1105 'sources': [
1071 'shell/app/resource.h', 1106 'shell/app/resource.h',
1072 'shell/app/shell.rc', 1107 'shell/app/shell.rc',
1073 # TODO: It would be nice to have these pulled in 1108 # TODO: It would be nice to have these pulled in
1074 # automatically from direct_dependent_settings in 1109 # automatically from direct_dependent_settings in
1075 # their various targets (net.gyp:net_resources, etc.), 1110 # their various targets (net.gyp:net_resources, etc.),
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
1723 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1758 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1724 }, 1759 },
1725 ], 1760 ],
1726 }], 1761 }],
1727 ], 1762 ],
1728 }, 1763 },
1729 ], 1764 ],
1730 }], 1765 }],
1731 ], 1766 ],
1732 } 1767 }
OLDNEW
« no previous file with comments | « content/content_resources.grd ('k') | content/public/browser/render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698