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

Unified Diff: chrome/chrome_browser.gypi

Issue 2800014: Reland r50057. This is exactly the same except with two lines cherrypicked from (Closed) Base URL: http://src.chromium.org/git/chromium.git
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/common/chrome_paths.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 38d609c9cdfb88159a289c2c47a55b77279fd590..764124d7ed91a4c2385bcd9ca199ea8f560da721 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',
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/common/chrome_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698