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

Side by Side Diff: webkit/tools/test_shell/test_shell.gypi

Issue 7041005: Content settings extension API: Implement ContentSetting.getResourceIdentifiers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 years, 6 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'test_shell_windows_resource_files': [ 7 'test_shell_windows_resource_files': [
8 'resources/test_shell.rc', 8 'resources/test_shell.rc',
9 '../../glue/resources/pan_east.cur', 9 '../../glue/resources/pan_east.cur',
10 '../../glue/resources/pan_middle.cur', 10 '../../glue/resources/pan_middle.cur',
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 'dependencies': [ 326 'dependencies': [
327 '<(DEPTH)/ui/ui.gyp:gfx_resources', 327 '<(DEPTH)/ui/ui.gyp:gfx_resources',
328 '<(DEPTH)/net/net.gyp:net_resources', 328 '<(DEPTH)/net/net.gyp:net_resources',
329 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 329 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
330 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', 330 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
331 ] 331 ]
332 }], 332 }],
333 ], 333 ],
334 }, 334 },
335 { 335 {
336 'target_name': 'test_shell_test_support',
337 'type': 'static_library',
338 'dependencies': [
339 '<(DEPTH)/webkit/support/webkit_support.gyp:glue'
340 ],
341 'sources': [
342 '../../plugins/npapi/stub_plugin_list.cc',
343 '../../plugins/npapi/stub_plugin_list.h',
tony 2011/06/14 17:46:56 Can we just include these files in test_shell_test
Bernhard Bauer 2011/06/15 10:04:57 I need them in browser_tests as well, and I didn't
344 ]
345 },
346 {
336 'target_name': 'test_shell_tests', 347 'target_name': 'test_shell_tests',
337 'type': 'executable', 348 'type': 'executable',
338 'variables': { 349 'variables': {
339 'chromium_code': 1, 350 'chromium_code': 1,
340 }, 351 },
341 'msvs_guid': 'E6766F81-1FCD-4CD7-BC16-E36964A14867', 352 'msvs_guid': 'E6766F81-1FCD-4CD7-BC16-E36964A14867',
342 #TODO(dmichael): Remove this #define once all plugins are ported from 353 #TODO(dmichael): Remove this #define once all plugins are ported from
343 # PPP_Instance and PPB_Instance scripting functions. 354 # PPP_Instance and PPB_Instance scripting functions.
344 'defines': [ 355 'defines': [
345 'PPAPI_INSTANCE_REMOVE_SCRIPTING', 356 'PPAPI_INSTANCE_REMOVE_SCRIPTING',
346 ], 357 ],
347 'dependencies': [ 358 'dependencies': [
348 'test_shell_common', 359 'test_shell_common',
360 'test_shell_test_support',
349 '<(DEPTH)/base/base.gyp:test_support_base', 361 '<(DEPTH)/base/base.gyp:test_support_base',
350 '<(DEPTH)/media/media.gyp:media_test_support', 362 '<(DEPTH)/media/media.gyp:media_test_support',
351 '<(DEPTH)/net/net.gyp:net', 363 '<(DEPTH)/net/net.gyp:net',
352 '<(DEPTH)/net/net.gyp:net_test_support', 364 '<(DEPTH)/net/net.gyp:net_test_support',
353 '<(DEPTH)/skia/skia.gyp:skia', 365 '<(DEPTH)/skia/skia.gyp:skia',
354 '<(DEPTH)/testing/gmock.gyp:gmock', 366 '<(DEPTH)/testing/gmock.gyp:gmock',
355 '<(DEPTH)/testing/gtest.gyp:gtest', 367 '<(DEPTH)/testing/gtest.gyp:gtest',
356 '<(DEPTH)/third_party/leveldb/leveldb.gyp:leveldb', 368 '<(DEPTH)/third_party/leveldb/leveldb.gyp:leveldb',
357 ], 369 ],
358 'sources': [ 370 'sources': [
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 ], 773 ],
762 }], 774 }],
763 ], 775 ],
764 } 776 }
765 777
766 # Local Variables: 778 # Local Variables:
767 # tab-width:2 779 # tab-width:2
768 # indent-tabs-mode:nil 780 # indent-tabs-mode:nil
769 # End: 781 # End:
770 # vim: set expandtab tabstop=2 shiftwidth=2: 782 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« webkit/plugins/npapi/stub_plugin_list.h ('K') | « webkit/plugins/npapi/stub_plugin_list.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698