summaryrefslogtreecommitdiffstats
path: root/tools/gritsettings
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 19:06:43 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 19:06:43 +0000
commitc655359e049d41721c0d9d65009a0870c9d30e4e (patch)
tree87856f00bfd12b284e41080aeb6d189f228693c8 /tools/gritsettings
parent82d5951d7369e815353defc62c653ed6e21676f2 (diff)
downloadchromium_src-c655359e049d41721c0d9d65009a0870c9d30e4e.zip
chromium_src-c655359e049d41721c0d9d65009a0870c9d30e4e.tar.gz
chromium_src-c655359e049d41721c0d9d65009a0870c9d30e4e.tar.bz2
Add trace-viewer to third party and redirect about:tracing to that implementation.
Review URL: https://chromiumcodereview.appspot.com/10546068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gritsettings')
-rw-r--r--tools/gritsettings/resource_ids3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index f9bc35e..1933a66 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -199,4 +199,7 @@
"chrome/common/extensions_api_resources.grd": {
"includes": [26000],
},
+ "third_party/trace-viewer/src/tracing.grd": {
+ "includes": [26500],
+ },
}