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

Unified Diff: chrome/browser/ui/webui/net_internals_ui.cc

Issue 8156001: net: rework the NPN patch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 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/ui/webui/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc
index 542fc1f426c337918c2a1939f287dfb218cd7daa..b730d47dbe869fc510a1c1a582816971ed2051c5 100644
--- a/chrome/browser/ui/webui/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals_ui.cc
@@ -1174,10 +1174,13 @@ void NetInternalsMessageHandler::IOThreadImpl::OnGetSpdyStatus(
net::HttpStreamFactory::force_spdy_always()));
// The next_protos may not be specified for certain configurations of SPDY.
- Value* next_protos_value = net::HttpStreamFactory::next_protos() ?
- Value::CreateStringValue(*net::HttpStreamFactory::next_protos()) :
- Value::CreateStringValue("");
-
+ Value* next_protos_value;
+ if (net::HttpStreamFactory::has_next_protos()) {
+ next_protos_value = Value::CreateStringValue(
+ JoinString(net::HttpStreamFactory::next_protos(), ','));
+ } else {
+ next_protos_value = Value::CreateStringValue("");
+ }
status_dict->Set("next_protos", next_protos_value);
SendJavascriptCommand("receivedSpdyStatus", status_dict);

Powered by Google App Engine
This is Rietveld 408576698