Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2081)

Unified Diff: chrome/browser/resources/net_internals/spdy_view.html

Issue 1387363004: Disable HTTP/2 over NPN (with OpenSSL). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable NPN in NSS if npn_protos.empty(). Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/net_internals/spdy_view.html
diff --git a/chrome/browser/resources/net_internals/spdy_view.html b/chrome/browser/resources/net_internals/spdy_view.html
index 964b111eaeef97ee51938ad3ffd5658e94fab0fb..0cfc85345d5700b6411b62cb5d13a1e39753e193 100644
--- a/chrome/browser/resources/net_internals/spdy_view.html
+++ b/chrome/browser/resources/net_internals/spdy_view.html
@@ -6,7 +6,12 @@
support importing netlog json files from earlier browsers.
TODO(bnc): Deprecate around 2016 February. -->
<li>Use Alternative Service: <span jscontent="$this.use_alternative_services || $this.use_alternate_protocols"></span></li>
- <li>Next Protocols: <span jscontent="next_protos"></span></li>
+ <!-- "alpn_protos" and "npn_protos" are used here since release 48, see
+ https://crrev.com/1387363004. "next_protos" is here to support
+ importing netlog json files from earlier browsers.
+ TODO(bnc): Deprecate around 2016 April. -->
+ <li>ALPN Protocols: <span jscontent="$this.alpn_protos || $this.next_protos"></span></li>
+ <li>NPN Protocols: <span jscontent="$this.npn_protos || $this.next_protos"></span></li>
</ul>
<h4>HTTP/2 sessions</h4>

Powered by Google App Engine
This is Rietveld 408576698