summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/net_internals/index.html
diff options
context:
space:
mode:
authortsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-25 21:19:29 +0000
committertsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-25 21:19:29 +0000
commit63a2139b9c84f0d50022f1dd7a1c10c968f8fc8d (patch)
treede7d7e2d26d5ccdee82671daa4f278f2e92c355a /chrome/browser/resources/net_internals/index.html
parenta4d36fdc0517732773bd5dd5d8b2e8f78db0546f (diff)
downloadchromium_src-63a2139b9c84f0d50022f1dd7a1c10c968f8fc8d.zip
chromium_src-63a2139b9c84f0d50022f1dd7a1c10c968f8fc8d.tar.gz
chromium_src-63a2139b9c84f0d50022f1dd7a1c10c968f8fc8d.tar.bz2
Apply content-security-policy to chrome://net-internals. Also get rid of yucky data: urls and serve help page from this UI source as well.
Review URL: http://codereview.chromium.org/7455005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/net_internals/index.html')
-rw-r--r--chrome/browser/resources/net_internals/index.html116
1 files changed, 15 insertions, 101 deletions
diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html
index d97ff93..fd54cdf 100644
--- a/chrome/browser/resources/net_internals/index.html
+++ b/chrome/browser/resources/net_internals/index.html
@@ -1,41 +1,20 @@
<!DOCTYPE HTML>
-<head i18n-values="dir:textdirection;">
+<html>
<!--
Copyright (c) 2011 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
- <head>
+ <head i18n-values="dir:textdirection;">
+ <include src="../content_security_policy.html"/>
<link rel="stylesheet" href="main.css">
<link rel="stylesheet" href="tabswitcherview.css">
- <script src="util.js"></script>
- <script src="view.js"></script>
- <script src="tabswitcherview.js"></script>
- <script src="dataview.js"></script>
- <script src="httpcacheview.js"></script>
- <script src="testview.js"></script>
- <script src="hstsview.js"></script>
- <script src="logdumputil.js"></script>
- <script src="main.js"></script>
- <script src="dnsview.js"></script>
- <script src="eventsview.js"></script>
- <script src="detailsview.js"></script>
- <script src="sourceentry.js"></script>
- <script src="resizableverticalsplitview.js"></script>
- <script src="topmidbottomview.js"></script>
- <script src="timelineviewpainter.js"></script>
- <script src="logviewpainter.js"></script>
- <script src="loggrouper.js"></script>
- <script src="proxyview.js"></script>
- <script src="socketpoolwrapper.js"></script>
- <script src="socketsview.js"></script>
- <script src="spdyview.js"></script>
- <script src="serviceprovidersview.js"></script>
- <script src="httpthrottlingview.js"></script>
- <script src="logsview.js"></script>
- <script src="prerenderview.js"></script>
+ <script src="chrome://resources/js/util.js"</script>
+ <script src="chrome://net-internals/index.js"></script>
+ <script src="chrome://net-internals/strings.js"></script>
</head>
- <body onload="onLoaded()" id=dataViewDropTarget>
+ <body id=dataViewDropTarget>
+
<!-- Tab switcher for main categories. -->
<div id=categoryTabHandles>
<ul>
@@ -278,7 +257,7 @@ found in the LICENSE file.
Strip private information (cookies and credentials).
</p>
<p>
- <a href="javascript:displayHelpForBugDump()">
+ <a href="chrome://net-internals/help.html" target="_blank">
Help: How to get data for bug reports?
</a>
</p>
@@ -305,7 +284,7 @@ found in the LICENSE file.
</p>
<p>Once a log is loaded, this page will stop collecting data, and will
only start gathering data again when
- <a href="javascript:history.go(0);">reloaded</a>.
+ <a id="reloaded-link" href="#">reloaded</a>.
</p>
</div>
</div>
@@ -340,79 +319,11 @@ found in the LICENSE file.
</tr>
</table>
-
+
<iframe style="display: none" id=dataViewDownloadIframe></iframe>
</div>
-<!-- START OF HELP TEXT -->
-<script>
-function displayHelpForBugDump() {
- // We can't access the popups loaded from WebUI pages, so we instead populate
- // its contents using a data:URL. YUCK!
- // TODO(eroman): do something less hacky, like exposing a new URL.
- var helpContents =
- document.getElementById('howtoDumpForBugsHelpContent').innerHTML;
- window.open('data:text/html,' + encodeURIComponent(helpContents));
-}
-</script>
-<div id=howtoDumpForBugsHelpContent style="display: none">
-<h2>How to get data for bug reports</h2>
-
-<ol>
-<li>Reproduce the network problem.</li>
-<li>Click the <i>Dump to file</i> button in the <i>Data</i> tab.</li>
-
-<li>The log file will act like a normal download.</li>
-
-<li>Email the log file to the bug investigator,
- <b>along with an explanation of what went wrong, including any relevant
- URLs.</b>
- You may want to compress the file before sending, as the log files can be
- fairly large but compress well.
-</li>
-
-</ol>
-
-
-<ul>
-<li>The network log <b>may contain personally identifying information</b> like
- IP addresses, URLs, and cookies.</li>
-<ul>
-<li>You can edit the log to obscure information if you like, but sometimes it
- is relevant to the bug. If you choose do this, please make sure you can still
- load the log file.</li>
-<li>If you choose not to have cookies removed from the log, you must toggle
- the checkbox before clicking the button.</li>
-</ul>
-<li>Ideally you would have the tool running <b>before</b> you reproduce the
- bug.
- If that isn't possible (perhaps the bug happens unpredictably), then the
- next best thing is to load chrome://net-internals/ <b>as soon as you can
- after</b> the problem has occurred.</li>
-</ul>
-
-<h2>How it works</h2>
-
-<ul>
- <li>While the net-internals page is open, it will capture the network events
- that are happening in Chrome. You can view that in real-time by going to
- the <i>Events</i> tab.</li>
- <li>Once you close the net-internals window, the data it had captured will be
- discarded.</li>
-<li>Chrome keeps around a small buffer of the most recent network events
- even when the net-internals window is not open. That way if you open
- chrome://net-internals/ <b>shortly after</b> encountering a problem,
- you may still find the relevant data.
- These <i>passively captured</i> events are less accurate however, and will
- be prefixed in the log with <span style="font-family: monospace;">(P)</span>.
-</li>
-</ul>
-
-<button onclick='window.close()'>Close this popup</button>
-<!-- END OF HELP TEXT -->
-</div>
-
<!-- Connection tests -->
<div id=testTabContent>
<p>Input a URL which failed to load, and then click the button to run some
@@ -516,7 +427,7 @@ function displayHelpForBugDump() {
</div>
<div id=detailsLogBox></div>
<div id=detailsTimelineBox></div>
-
+
<!-- ============================ Logs View ============================ -->
<div id=logsTabContent style="display: none;">
<h4>Network Log Data</h4>
@@ -536,5 +447,8 @@ function displayHelpForBugDump() {
</tbody>
</table>
</div>
+ <script src="chrome://resources/js/i18n_template.js"></script>
+ <script src="chrome://resources/js/i18n_process.js"></script>
+ <script src="chrome://resources/js/jstemplate_compiled.js"></script>
</body>
</html>