summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_resources.grd
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 00:26:51 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 00:26:51 +0000
commitc92c75056e673bcaa04683e382414e2fa02aa714 (patch)
tree98b58f310d3dcd58bb840634122b43580159d2de /chrome/browser/browser_resources.grd
parentc571c8d87eed98769157c8ca9fec60b5e4d42995 (diff)
downloadchromium_src-c92c75056e673bcaa04683e382414e2fa02aa714.zip
chromium_src-c92c75056e673bcaa04683e382414e2fa02aa714.tar.gz
chromium_src-c92c75056e673bcaa04683e382414e2fa02aa714.tar.bz2
Add a DOMUI datasource that will handle the net-internals page.
Right now it is bound to the temporary URL "chrome://net2", since the frontend is under construction. (Loading this page right now just shows a dummy HTML page.) This change is a first step to transitioning the about:net-internals / about:network pages from C++ to javascript. Note that the network stuff needs to run on the IO thread, however the DOMUI infrastructure is all set up to run on the UI thread. I work around this by proxying things back and forth through the IO thread. Hopefully in subsequent iterations this overhead can be removed, by exposing a sort of "IO thread DOMUI". BUG=37421 Review URL: http://codereview.chromium.org/1036001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
-rw-r--r--chrome/browser/browser_resources.grd1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 6980e6d..fcf35ba 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -64,6 +64,7 @@ without changes to the corresponding grd file. tet -->
<include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_icon.html" type="BINDATA" />
<include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2line.html" type="BINDATA" />
<include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1line.html" type="BINDATA" />
+ <include name="IDR_NET_INTERNALS_HTML" file="resources\net_internals\index.html" type="BINDATA" />
</includes>
</release>
</grit>