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

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: rebase Created 8 years, 4 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 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1443 SendJavascriptCommand("receivedSetNetworkDebugMode", 1443 SendJavascriptCommand("receivedSetNetworkDebugMode",
1444 Value::CreateStringValue(status)); 1444 Value::CreateStringValue(status));
1445 } 1445 }
1446 #endif // defined(OS_CHROMEOS) 1446 #endif // defined(OS_CHROMEOS)
1447 1447
1448 void NetInternalsMessageHandler::IOThreadImpl::OnGetHttpPipeliningStatus( 1448 void NetInternalsMessageHandler::IOThreadImpl::OnGetHttpPipeliningStatus(
1449 const ListValue* list) { 1449 const ListValue* list) {
1450 DCHECK(!list); 1450 DCHECK(!list);
1451 DictionaryValue* status_dict = new DictionaryValue(); 1451 DictionaryValue* status_dict = new DictionaryValue();
1452 1452
1453 status_dict->Set("pipelining_enabled",
1454 Value::CreateBooleanValue(
1455 net::HttpStreamFactory::http_pipelining_enabled()));
1456
1457 net::HttpNetworkSession* http_network_session = 1453 net::HttpNetworkSession* http_network_session =
1458 GetHttpNetworkSession(context_getter_->GetURLRequestContext()); 1454 GetHttpNetworkSession(context_getter_->GetURLRequestContext());
1455 status_dict->Set("pipelining_enabled", Value::CreateBooleanValue(
1456 http_network_session->params().http_pipelining_enabled));
1459 Value* pipelined_connection_info = NULL; 1457 Value* pipelined_connection_info = NULL;
1460 if (http_network_session) { 1458 if (http_network_session) {
1461 pipelined_connection_info = 1459 pipelined_connection_info =
1462 http_network_session->http_stream_factory()->PipelineInfoToValue(); 1460 http_network_session->http_stream_factory()->PipelineInfoToValue();
1463 } 1461 }
1464 status_dict->Set("pipelined_connection_info", pipelined_connection_info); 1462 status_dict->Set("pipelined_connection_info", pipelined_connection_info);
1465 1463
1466 const net::HttpServerProperties& http_server_properties = 1464 const net::HttpServerProperties& http_server_properties =
1467 *context_getter_->GetURLRequestContext()->http_server_properties(); 1465 *context_getter_->GetURLRequestContext()->http_server_properties();
1468 1466
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 } 1741 }
1744 1742
1745 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1743 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1746 : WebUIController(web_ui) { 1744 : WebUIController(web_ui) {
1747 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 1745 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
1748 1746
1749 // Set up the chrome://net-internals/ source. 1747 // Set up the chrome://net-internals/ source.
1750 Profile* profile = Profile::FromWebUI(web_ui); 1748 Profile* profile = Profile::FromWebUI(web_ui);
1751 ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource()); 1749 ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource());
1752 } 1750 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698