diff options
Diffstat (limited to 'chromium/chrome/browser/resources/net_internals')
8 files changed, 12 insertions, 35 deletions
diff --git a/chromium/chrome/browser/resources/net_internals/browser_bridge.js b/chromium/chrome/browser/resources/net_internals/browser_bridge.js index 2b976a4cd48..85e6bdc9dc5 100644 --- a/chromium/chrome/browser/resources/net_internals/browser_bridge.js +++ b/chromium/chrome/browser/resources/net_internals/browser_bridge.js @@ -211,10 +211,6 @@ var BrowserBridge = (function() { this.send('getDataReductionProxyInfo'); }, - enableIPv6: function() { - this.send('enableIPv6'); - }, - setCaptureMode: function(captureMode) { this.send('setCaptureMode', ['' + captureMode]); }, diff --git a/chromium/chrome/browser/resources/net_internals/dns_view.html b/chromium/chrome/browser/resources/net_internals/dns_view.html index 69b94f745ff..0786cad0a26 100644 --- a/chromium/chrome/browser/resources/net_internals/dns_view.html +++ b/chromium/chrome/browser/resources/net_internals/dns_view.html @@ -2,12 +2,6 @@ <div id=dns-view-tab-content class=content-box> <ul style='margin-top: 0'> <li><a href='#events&q=type:HOST_RESOLVER_IMPL_JOB%20is:active'>View pending lookups</a></li> - <li>Default address family: <span id=dns-view-default-family></span> - <span id=dns-view-ipv6-disabled class=warning-text style="display: none;"> - (IPv6 disabled) - <input type=button value="Enable IPv6" id=dns-view-enable-ipv6 class="hide-when-not-capturing"> - </span> - </li> </ul> <div> diff --git a/chromium/chrome/browser/resources/net_internals/dns_view.js b/chromium/chrome/browser/resources/net_internals/dns_view.js index ce507efa167..b431b74b439 100644 --- a/chromium/chrome/browser/resources/net_internals/dns_view.js +++ b/chromium/chrome/browser/resources/net_internals/dns_view.js @@ -6,7 +6,6 @@ * This view displays information on the host resolver: * * - Shows the default address family. - * - Has a button to enable IPv6, if it is disabled. * - Shows the current host cache contents. * - Has a button to clear the host cache. * - Shows the parameters used to construct the host cache (capacity, ttl). @@ -32,8 +31,6 @@ var DnsView = (function() { // Call superclass's constructor. superClass.call(this, DnsView.MAIN_BOX_ID); - $(DnsView.ENABLE_IPV6_BUTTON_ID).onclick = - g_browser.enableIPv6.bind(g_browser); $(DnsView.CLEAR_CACHE_BUTTON_ID).onclick = g_browser.sendClearHostResolverCache.bind(g_browser); @@ -47,9 +44,6 @@ var DnsView = (function() { // IDs for special HTML elements in dns_view.html DnsView.MAIN_BOX_ID = 'dns-view-tab-content'; - DnsView.DEFAULT_FAMILY_SPAN_ID = 'dns-view-default-family'; - DnsView.IPV6_DISABLED_SPAN_ID = 'dns-view-ipv6-disabled'; - DnsView.ENABLE_IPV6_BUTTON_ID = 'dns-view-enable-ipv6'; DnsView.INTERNAL_DNS_ENABLED_SPAN_ID = 'dns-view-internal-dns-enabled'; DnsView.INTERNAL_DNS_INVALID_CONFIG_SPAN_ID = @@ -75,7 +69,6 @@ var DnsView = (function() { onHostResolverInfoChanged: function(hostResolverInfo) { // Clear the existing values. - $(DnsView.DEFAULT_FAMILY_SPAN_ID).innerHTML = ''; $(DnsView.CAPACITY_SPAN_ID).innerHTML = ''; $(DnsView.CACHE_TBODY_ID).innerHTML = ''; $(DnsView.ACTIVE_SPAN_ID).innerHTML = '0'; @@ -88,13 +81,6 @@ var DnsView = (function() { if (!hostResolverInfo || !hostResolverInfo.cache) return false; - var family = hostResolverInfo.default_address_family; - addTextNode($(DnsView.DEFAULT_FAMILY_SPAN_ID), - addressFamilyToString(family)); - - var ipv6Disabled = (family == AddressFamily.ADDRESS_FAMILY_IPV4); - setNodeDisplay($(DnsView.IPV6_DISABLED_SPAN_ID), ipv6Disabled); - // Fill in the basic cache information. var hostResolverCache = hostResolverInfo.cache; $(DnsView.CAPACITY_SPAN_ID).innerText = hostResolverCache.capacity; diff --git a/chromium/chrome/browser/resources/net_internals/hsts_view.js b/chromium/chrome/browser/resources/net_internals/hsts_view.js index 2310b9f7907..28b921ae7ca 100644 --- a/chromium/chrome/browser/resources/net_internals/hsts_view.js +++ b/chromium/chrome/browser/resources/net_internals/hsts_view.js @@ -169,7 +169,7 @@ var HSTSView = (function() { function modeToString(m) { // These numbers must match those in - // TransportSecurityState::DomainState::UpgradeMode. + // TransportSecurityState::STSState::UpgradeMode. if (m == 0) { return 'STRICT'; } else if (m == 1) { diff --git a/chromium/chrome/browser/resources/net_internals/log_view_painter.js b/chromium/chrome/browser/resources/net_internals/log_view_painter.js index 05d85eb040f..4b29de3994d 100644 --- a/chromium/chrome/browser/resources/net_internals/log_view_painter.js +++ b/chromium/chrome/browser/resources/net_internals/log_view_painter.js @@ -116,10 +116,11 @@ function addRowWithTime(tablePrinter, eventTime, startTime) { * the hexadecimal characters from |hexString| on the left, in groups of * two, and their corresponding ASCII characters on the right. * - * |asciiCharsPerLine| specifies how many ASCII characters will be put on each - * line of the output string. + * 16 bytes will be placed on each line of the output string, split into two + * columns of 8. */ -function writeHexString(hexString, asciiCharsPerLine, out) { +function writeHexString(hexString, out) { + var asciiCharsPerLine = 16; // Number of transferred bytes in a line of output. Length of a // line is roughly 4 times larger. var hexCharsPerLine = 2 * asciiCharsPerLine; @@ -127,6 +128,9 @@ function writeHexString(hexString, asciiCharsPerLine, out) { var hexLine = ''; var asciiLine = ''; for (var j = i; j < i + hexCharsPerLine && j < hexString.length; j += 2) { + // Split into two columns of 8 bytes each. + if (j == i + hexCharsPerLine / 2) + hexLine += ' '; var hex = hexString.substr(j, 2); hexLine += hex + ' '; var charCode = parseInt(hex, 16); @@ -144,7 +148,8 @@ function writeHexString(hexString, asciiCharsPerLine, out) { // Make the ASCII text for the last line of output align with the previous // lines. - hexLine += makeRepeatedString(' ', 3 * asciiCharsPerLine - hexLine.length); + hexLine += makeRepeatedString(' ', + 3 * asciiCharsPerLine + 1 - hexLine.length); out.writeLine(' ' + hexLine + ' ' + asciiLine); } } @@ -304,7 +309,7 @@ function defaultWriteParameter(key, value, out) { // For transferred bytes, display the bytes in hex and ASCII. if (key == 'hex_encoded_bytes' && typeof value == 'string') { out.writeArrowKey(key); - writeHexString(value, 20, out); + writeHexString(value, out); return; } diff --git a/chromium/chrome/browser/resources/net_internals/quic_view.html b/chromium/chrome/browser/resources/net_internals/quic_view.html index d90ebee15ee..2b3f8000d9f 100644 --- a/chromium/chrome/browser/resources/net_internals/quic_view.html +++ b/chromium/chrome/browser/resources/net_internals/quic_view.html @@ -10,6 +10,7 @@ <li>Origin To Force QUIC On: <span jscontent="origin_to_force_quic_on"></span></li> <li>QUIC connection options: <span jscontent="connection_options"></span></li> <li>Consistent Port Selection Enabled: <span jscontent="!!enable_quic_port_selection"></span></li> + <li jsdisplay="$this.disabled_reason && disabled_reason.length > 0">QUIC dynamically disabled: <span jscontent="disabled_reason"></span></li> </ul> <h4>QUIC sessions</h4> diff --git a/chromium/chrome/browser/resources/net_internals/sdch_view.html b/chromium/chrome/browser/resources/net_internals/sdch_view.html index 2cbfca5292a..0288d968943 100644 --- a/chromium/chrome/browser/resources/net_internals/sdch_view.html +++ b/chromium/chrome/browser/resources/net_internals/sdch_view.html @@ -3,10 +3,6 @@ <li>SDCH Enabled: <span jscontent="!!sdch_enabled" id=sdch-view-sdch-enabled></span> </li> - <li>Secure Scheme Support Enabled: - <span jscontent="!!secure_scheme_support" - id=sdch-view-secure-scheme-support></span> - </li> </ul> <p>SDCH Errors: diff --git a/chromium/chrome/browser/resources/net_internals/source_entry.js b/chromium/chrome/browser/resources/net_internals/source_entry.js index bf4259d7049..e1e217b188f 100644 --- a/chromium/chrome/browser/resources/net_internals/source_entry.js +++ b/chromium/chrome/browser/resources/net_internals/source_entry.js @@ -82,7 +82,6 @@ var SourceEntry = (function() { // TODO(ricea): Remove SOCKET_STREAM after M41 is released. case EventSourceType.SOCKET_STREAM: case EventSourceType.HTTP_STREAM_JOB: - case EventSourceType.ASYNC_REVALIDATION: this.description_ = e.params.url; break; case EventSourceType.CONNECT_JOB: |