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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 2852011: Revert 50057 - Load net-internals from the newly created resources.pak file.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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
« no previous file with comments | « chrome/browser/dom_ui/net_internals_ui.cc ('k') | chrome/common/chrome_paths.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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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': 'browser', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
11 'dependencies': [ 11 'dependencies': [
12 'common', 12 'common',
13 'common_net', 13 'common_net',
14 'chrome_extra_resources', 14 'chrome_extra_resources',
15 'chrome_resources', 15 'chrome_resources',
16 'chrome_strings', 16 'chrome_strings',
17 'chrome_version_info', 17 'chrome_version_info',
18 'component_extensions', 18 'component_extensions',
19 'domui_shared_resources', 19 'domui_shared_resources',
20 'net_internals_resources',
20 'platform_locale_settings', 21 'platform_locale_settings',
21 'profile_import', 22 'profile_import',
22 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 23 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
23 'syncapi', 24 'syncapi',
24 'theme_resources', 25 'theme_resources',
25 'userfeedback_proto', 26 'userfeedback_proto',
26 '../app/app.gyp:app_resources', 27 '../app/app.gyp:app_resources',
27 '../app/app.gyp:app_strings', 28 '../app/app.gyp:app_strings',
28 '../media/media.gyp:media', 29 '../media/media.gyp:media',
29 '../printing/printing.gyp:printing', 30 '../printing/printing.gyp:printing',
(...skipping 2634 matching lines...) Expand 10 before | Expand all | Expand 10 after
2664 'browser/worker_host/worker_document_set.h', 2665 'browser/worker_host/worker_document_set.h',
2665 'browser/worker_host/worker_process_host.cc', 2666 'browser/worker_host/worker_process_host.cc',
2666 'browser/worker_host/worker_process_host.h', 2667 'browser/worker_host/worker_process_host.h',
2667 'browser/worker_host/worker_service.cc', 2668 'browser/worker_host/worker_service.cc',
2668 'browser/worker_host/worker_service.h', 2669 'browser/worker_host/worker_service.h',
2669 'browser/wrench_menu_model.cc', 2670 'browser/wrench_menu_model.cc',
2670 'browser/wrench_menu_model.h', 2671 'browser/wrench_menu_model.h',
2671 'browser/zygote_host_linux.cc', 2672 'browser/zygote_host_linux.cc',
2672 'browser/zygote_main_linux.cc', 2673 'browser/zygote_main_linux.cc',
2673 2674
2674 # These files are generated by GRIT. 2675 # This file is generated by GRIT.
2675 '<(grit_out_dir)/grit/theme_resources_map.cc', 2676 '<(grit_out_dir)/grit/theme_resources_map.cc',
2676 '<(grit_out_dir)/grit/net_internals_resources_map.cc',
2677 ], 2677 ],
2678 'conditions': [ 2678 'conditions': [
2679 ['javascript_engine=="v8"', { 2679 ['javascript_engine=="v8"', {
2680 'defines': [ 2680 'defines': [
2681 'CHROME_V8', 2681 'CHROME_V8',
2682 ], 2682 ],
2683 }], 2683 }],
2684 ['chromeos==0', { 2684 ['chromeos==0', {
2685 'sources/': [ 2685 'sources/': [
2686 ['exclude', '^browser/chromeos'], 2686 ['exclude', '^browser/chromeos'],
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
3533 'browser/resources/chat_manager/js/chatbridgeeventtypes.js', 3533 'browser/resources/chat_manager/js/chatbridgeeventtypes.js',
3534 'browser/resources/chat_manager/js/chatbridgehook.js', 3534 'browser/resources/chat_manager/js/chatbridgehook.js',
3535 'browser/resources/chat_manager/js/gmailbridgehook.js', 3535 'browser/resources/chat_manager/js/gmailbridgehook.js',
3536 ] 3536 ]
3537 }, 3537 },
3538 ] 3538 ]
3539 }] 3539 }]
3540 ], 3540 ],
3541 }, 3541 },
3542 { 3542 {
3543 'target_name': 'net_internals_resources',
3544 'type': 'none',
3545 # TODO(eroman): Once the msvs port supports it, change this to recursively
3546 # copy the entire directory instead of listing the files.
3547 # http://code.google.com/p/gyp/issues/detail?id=143.
3548 'copies': [
3549 {
3550 'destination': '<(PRODUCT_DIR)/resources/net_internals',
3551 'files': [
3552 'browser/resources/net_internals/dataview.js',
3553 'browser/resources/net_internals/detailsview.js',
3554 'browser/resources/net_internals/dnsview.js',
3555 'browser/resources/net_internals/httpcacheview.js',
3556 'browser/resources/net_internals/index.html',
3557 'browser/resources/net_internals/loggrouper.js',
3558 'browser/resources/net_internals/logviewpainter.js',
3559 'browser/resources/net_internals/main.css',
3560 'browser/resources/net_internals/main.js',
3561 'browser/resources/net_internals/proxyview.js',
3562 'browser/resources/net_internals/requestsview.js',
3563 'browser/resources/net_internals/resizableverticalsplitview.js',
3564 'browser/resources/net_internals/sourceentry.js',
3565 'browser/resources/net_internals/tabswitcherview.js',
3566 'browser/resources/net_internals/testview.js',
3567 'browser/resources/net_internals/timelineviewpainter.js',
3568 'browser/resources/net_internals/topmidbottomview.js',
3569 'browser/resources/net_internals/util.js',
3570 'browser/resources/net_internals/view.js',
3571 ]
3572 },
3573 ]
3574 },
3575 {
3543 # Protobuf compiler / generate rule for feedback 3576 # Protobuf compiler / generate rule for feedback
3544 'target_name': 'userfeedback_proto', 3577 'target_name': 'userfeedback_proto',
3545 'type': 'none', 3578 'type': 'none',
3546 'sources': [ 3579 'sources': [
3547 'browser/userfeedback/proto/annotations.proto', 3580 'browser/userfeedback/proto/annotations.proto',
3548 'browser/userfeedback/proto/common.proto', 3581 'browser/userfeedback/proto/common.proto',
3549 'browser/userfeedback/proto/config.proto', 3582 'browser/userfeedback/proto/config.proto',
3550 'browser/userfeedback/proto/dom.proto', 3583 'browser/userfeedback/proto/dom.proto',
3551 'browser/userfeedback/proto/extension.proto', 3584 'browser/userfeedback/proto/extension.proto',
3552 'browser/userfeedback/proto/math.proto', 3585 'browser/userfeedback/proto/math.proto',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
3592 ], 3625 ],
3593 }, 3626 },
3594 ], 3627 ],
3595 } 3628 }
3596 3629
3597 # Local Variables: 3630 # Local Variables:
3598 # tab-width:2 3631 # tab-width:2
3599 # indent-tabs-mode:nil 3632 # indent-tabs-mode:nil
3600 # End: 3633 # End:
3601 # vim: set expandtab tabstop=2 shiftwidth=2: 3634 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/net_internals_ui.cc ('k') | chrome/common/chrome_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698