summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/net_internals/index.html
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-18 18:32:45 +0000
committerBen Murdoch <benm@google.com>2010-11-18 18:38:07 +0000
commit513209b27ff55e2841eac0e4120199c23acce758 (patch)
treeaeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/resources/net_internals/index.html
parent164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff)
downloadexternal_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/resources/net_internals/index.html')
-rw-r--r--chrome/browser/resources/net_internals/index.html11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html
index d146242..1a95210 100644
--- a/chrome/browser/resources/net_internals/index.html
+++ b/chrome/browser/resources/net_internals/index.html
@@ -69,6 +69,17 @@ found in the LICENSE file.
</tr></table>
+ <h4>Proxy auto-config initialization</h4>
+ <ul>
+ <li>
+ <a href='#events&q=type:INIT_PROXY_RESOLVER'>View all events</a>
+ </li>
+ <li>
+ Latest proxy resolver event:
+ <pre id=proxyResolverLog></pre>
+ </li>
+ </ul>
+
<h4>
Proxies which have failed recently, and are marked as bad
<input type=button value="Clear bad proxies" id=clearBadProxies />