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

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

Powered by Google App Engine
This is Rietveld 408576698