OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" | 5 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <list> | 8 #include <list> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1262 void NetInternalsMessageHandler::IOThreadImpl::OnGetHttpPipeliningStatus( | 1262 void NetInternalsMessageHandler::IOThreadImpl::OnGetHttpPipeliningStatus( |
1263 const ListValue* list) { | 1263 const ListValue* list) { |
1264 DictionaryValue* status_dict = new DictionaryValue(); | 1264 DictionaryValue* status_dict = new DictionaryValue(); |
1265 | 1265 |
1266 status_dict->Set("pipelining_enabled", | 1266 status_dict->Set("pipelining_enabled", |
1267 Value::CreateBooleanValue( | 1267 Value::CreateBooleanValue( |
1268 net::HttpStreamFactory::http_pipelining_enabled())); | 1268 net::HttpStreamFactory::http_pipelining_enabled())); |
1269 | 1269 |
1270 net::HttpNetworkSession* http_network_session = | 1270 net::HttpNetworkSession* http_network_session = |
1271 GetHttpNetworkSession(context_getter_->GetURLRequestContext()); | 1271 GetHttpNetworkSession(context_getter_->GetURLRequestContext()); |
1272 Value* pipelined_conneciton_info = | 1272 Value* pipelined_conneciton_info = NULL; |
eroman
2012/03/27 18:05:52
nit: can you fix the typo on connection_info?
kmadhusu
2012/03/27 18:19:04
Done.
| |
1273 http_network_session->http_stream_factory()->PipelineInfoToValue(); | 1273 if (http_network_session) |
1274 http_network_session->http_stream_factory()->PipelineInfoToValue(); | |
eroman
2012/03/27 18:05:52
Need to assign to pipelined_connection_info or thi
kmadhusu
2012/03/27 18:19:04
oops. Forgot to assign it. Fixed.
| |
1274 status_dict->Set("pipelined_connection_info", pipelined_conneciton_info); | 1275 status_dict->Set("pipelined_connection_info", pipelined_conneciton_info); |
1275 | 1276 |
1276 const net::HttpServerProperties& http_server_properties = | 1277 const net::HttpServerProperties& http_server_properties = |
1277 *context_getter_->GetURLRequestContext()->http_server_properties(); | 1278 *context_getter_->GetURLRequestContext()->http_server_properties(); |
1278 | 1279 |
1279 // TODO(simonjam): This call is slow. | 1280 // TODO(simonjam): This call is slow. |
1280 const net::PipelineCapabilityMap pipeline_capability_map = | 1281 const net::PipelineCapabilityMap pipeline_capability_map = |
1281 http_server_properties.GetPipelineCapabilityMap(); | 1282 http_server_properties.GetPipelineCapabilityMap(); |
1282 | 1283 |
1283 ListValue* known_hosts_list = new ListValue(); | 1284 ListValue* known_hosts_list = new ListValue(); |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1567 | 1568 |
1568 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) | 1569 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) |
1569 : WebUIController(web_ui) { | 1570 : WebUIController(web_ui) { |
1570 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); | 1571 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); |
1571 | 1572 |
1572 // Set up the chrome://net-internals/ source. | 1573 // Set up the chrome://net-internals/ source. |
1573 Profile* profile = Profile::FromWebUI(web_ui); | 1574 Profile* profile = Profile::FromWebUI(web_ui); |
1574 profile->GetChromeURLDataManager()->AddDataSource( | 1575 profile->GetChromeURLDataManager()->AddDataSource( |
1575 CreateNetInternalsHTMLSource()); | 1576 CreateNetInternalsHTMLSource()); |
1576 } | 1577 } |
OLD | NEW |