summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 17:36:39 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 17:36:39 +0000
commit044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d (patch)
tree53becf6424efc668da228eebd3685ba2bdc53398 /chrome/chrome_browser.gypi
parentad4f19d37519b5b9aef6d3e1f59f9d5802d39437 (diff)
downloadchromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.zip
chromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.tar.gz
chromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.tar.bz2
Reland r50057. This is exactly the same except with two lines cherrypicked from
tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h} files. Load net-internals from the newly created resources.pak file. This patch also forces the loading of the optional DataPack for const correctness reasons Original Review: http://codereview.chromium.org/2855003 BUG=35793,42770 TEST=none TBR=tony Review URL: http://codereview.chromium.org/2800014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rwxr-xr-xchrome/chrome_browser.gypi37
1 files changed, 2 insertions, 35 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 291f5dc..8ccc73a1f 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -17,7 +17,6 @@
'chrome_version_info',
'component_extensions',
'domui_shared_resources',
- 'net_internals_resources',
'platform_locale_settings',
'profile_import',
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
@@ -2680,8 +2679,9 @@
'browser/zygote_host_linux.cc',
'browser/zygote_main_linux.cc',
- # This file is generated by GRIT.
+ # These files are generated by GRIT.
'<(grit_out_dir)/grit/theme_resources_map.cc',
+ '<(grit_out_dir)/grit/net_internals_resources_map.cc',
],
'conditions': [
['javascript_engine=="v8"', {
@@ -3548,39 +3548,6 @@
],
},
{
- 'target_name': 'net_internals_resources',
- 'type': 'none',
- # TODO(eroman): Once the msvs port supports it, change this to recursively
- # copy the entire directory instead of listing the files.
- # http://code.google.com/p/gyp/issues/detail?id=143.
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)/resources/net_internals',
- 'files': [
- 'browser/resources/net_internals/dataview.js',
- 'browser/resources/net_internals/detailsview.js',
- 'browser/resources/net_internals/dnsview.js',
- 'browser/resources/net_internals/httpcacheview.js',
- 'browser/resources/net_internals/index.html',
- 'browser/resources/net_internals/loggrouper.js',
- 'browser/resources/net_internals/logviewpainter.js',
- 'browser/resources/net_internals/main.css',
- 'browser/resources/net_internals/main.js',
- 'browser/resources/net_internals/proxyview.js',
- 'browser/resources/net_internals/requestsview.js',
- 'browser/resources/net_internals/resizableverticalsplitview.js',
- 'browser/resources/net_internals/sourceentry.js',
- 'browser/resources/net_internals/tabswitcherview.js',
- 'browser/resources/net_internals/testview.js',
- 'browser/resources/net_internals/timelineviewpainter.js',
- 'browser/resources/net_internals/topmidbottomview.js',
- 'browser/resources/net_internals/util.js',
- 'browser/resources/net_internals/view.js',
- ]
- },
- ]
- },
- {
# Protobuf compiler / generate rule for feedback
'target_name': 'userfeedback_proto',
'type': 'none',