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

Side by Side Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 10834215: Remove static variables from HttpStreamFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: GetNetworkSessionParams returns const* Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <list> 7 #include <list>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after
1441 SendJavascriptCommand("receivedSetNetworkDebugMode", 1441 SendJavascriptCommand("receivedSetNetworkDebugMode",
1442 Value::CreateStringValue(status)); 1442 Value::CreateStringValue(status));
1443 } 1443 }
1444 #endif // defined(OS_CHROMEOS) 1444 #endif // defined(OS_CHROMEOS)
1445 1445
1446 void NetInternalsMessageHandler::IOThreadImpl::OnGetHttpPipeliningStatus( 1446 void NetInternalsMessageHandler::IOThreadImpl::OnGetHttpPipeliningStatus(
1447 const ListValue* list) { 1447 const ListValue* list) {
1448 DCHECK(!list); 1448 DCHECK(!list);
1449 DictionaryValue* status_dict = new DictionaryValue(); 1449 DictionaryValue* status_dict = new DictionaryValue();
1450 1450
1451 status_dict->Set("pipelining_enabled",
1452 Value::CreateBooleanValue(
1453 net::HttpStreamFactory::http_pipelining_enabled()));
1454
1455 net::HttpNetworkSession* http_network_session = 1451 net::HttpNetworkSession* http_network_session =
1456 GetHttpNetworkSession(context_getter_->GetURLRequestContext()); 1452 GetHttpNetworkSession(context_getter_->GetURLRequestContext());
1453 status_dict->Set("pipelining_enabled", Value::CreateBooleanValue(
1454 http_network_session->params().http_pipelining_enabled));
1457 Value* pipelined_connection_info = NULL; 1455 Value* pipelined_connection_info = NULL;
1458 if (http_network_session) { 1456 if (http_network_session) {
1459 pipelined_connection_info = 1457 pipelined_connection_info =
1460 http_network_session->http_stream_factory()->PipelineInfoToValue(); 1458 http_network_session->http_stream_factory()->PipelineInfoToValue();
1461 } 1459 }
1462 status_dict->Set("pipelined_connection_info", pipelined_connection_info); 1460 status_dict->Set("pipelined_connection_info", pipelined_connection_info);
1463 1461
1464 const net::HttpServerProperties& http_server_properties = 1462 const net::HttpServerProperties& http_server_properties =
1465 *context_getter_->GetURLRequestContext()->http_server_properties(); 1463 *context_getter_->GetURLRequestContext()->http_server_properties();
1466 1464
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1741 } 1739 }
1742 1740
1743 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1741 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1744 : WebUIController(web_ui) { 1742 : WebUIController(web_ui) {
1745 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 1743 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
1746 1744
1747 // Set up the chrome://net-internals/ source. 1745 // Set up the chrome://net-internals/ source.
1748 Profile* profile = Profile::FromWebUI(web_ui); 1746 Profile* profile = Profile::FromWebUI(web_ui);
1749 ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource()); 1747 ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource());
1750 } 1748 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698