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

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: Re: #7. 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
« no previous file with comments | « chrome/browser/net/preconnect.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 63015fab272043953a0a7f5e97c9623041588716..825492eb07670fa5c4d57c8f4116a74ef2207f26 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 == undefined ? $this.use_alternate_protocols : $this.use_alternative_services"></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>
« no previous file with comments | « chrome/browser/net/preconnect.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698