summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/net_internals/index.html
diff options
context:
space:
mode:
authormmenke@google.com <mmenke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-26 00:09:07 +0000
committermmenke@google.com <mmenke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-26 00:09:07 +0000
commit44d33b4816fa103086266bf77030e8bec2336a22 (patch)
tree00df51214d9a88102313f44af84a60b6851f7b27 /chrome/browser/resources/net_internals/index.html
parenta1be9ffd087904ffef1749db5048c3d49588fbb4 (diff)
downloadchromium_src-44d33b4816fa103086266bf77030e8bec2336a22.zip
chromium_src-44d33b4816fa103086266bf77030e8bec2336a22.tar.gz
chromium_src-44d33b4816fa103086266bf77030e8bec2336a22.tar.bz2
Adds the ability to load JSON log files to about:net-internals.
Only works with logs created by the new "--log-net-log=file", which writes NetLog events to the specified file, regardless of other logging command line parameters. Using "--log-net-log" without a file name will just write NetLog events to VLOG(1), as before. BUG=63687 TEST=None Review URL: http://codereview.chromium.org/6025017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/net_internals/index.html')
-rw-r--r--chrome/browser/resources/net_internals/index.html44
1 files changed, 31 insertions, 13 deletions
diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html
index 732c4be..0cbadb7 100644
--- a/chrome/browser/resources/net_internals/index.html
+++ b/chrome/browser/resources/net_internals/index.html
@@ -202,23 +202,41 @@ found in the LICENSE file.
<table width=100%>
<tr>
<td valign=top>
- <h2>Dump data</h2>
- <div style="margin: 8px">
- <p><input id=securityStrippingCheckbox type=checkbox checked=yes>
- Strip private information (cookies and credentials).
- </p>
- <p>
- <a href="javascript:displayHelpForBugDump()">
- Help: How to get data for bug reports?
- </a>
- </p>
- <button id=exportToText class=bigButton>Dump to text</button>
+ <div id=dataViewDumpDataDiv>
+ <h2>Dump data</h2>
+ <div style="margin: 8px">
+ <p><input id=securityStrippingCheckbox type=checkbox checked=yes>
+ Strip private information (cookies and credentials).
+ </p>
+ <p>
+ <a href="javascript:displayHelpForBugDump()">
+ Help: How to get data for bug reports?
+ </a>
+ </p>
+ <button id=exportToText class=bigButton>Dump to text</button>
+ </div>
+ </div>
+ <div id=dataViewLoadDataDiv>
+ <h2>Load data</h2>
+ <div style="margin: 8px">
+ <p><input type=button value="Load log from file" id=dataViewLoadLogFile /></p>
+ <p>Only works with log files created with "--log-net-log=file_name".</p>
+ <p>Once a log is loaded, this page will stop collecting data, and will
+ only start gathering data again when the page is
+ <a href="javascript:history.go(0);">reloaded</a>.<BR>
+ </p>
+ </div>
</div>
</td>
<td align=right valign=top>
- <div class="capturingBox">
- <b>Capturing all events...</b>
+ <div class="capturingBox" id=dataViewCapturingBox>
+ <span id=dataViewCapturingTextSpan>
+ <b>Capturing all events...</b>
+ </span>
+ <span id=dataViewLoggingTextSpan style="display: none;">
+ <b>Viewing loaded log file.</b>
+ </span>
<table style="margin: 8px">
<tr>
<td>Passively captured:</td>