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

Side by Side Diff: net/http/http_proxy_client_socket_pool.cc

Issue 15662008: Make net and ipc explicitly use the base namespace for Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « net/http/http_pipelined_host_pool.cc ('k') | net/http/http_request_headers.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "net/http/http_proxy_client_socket_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 } 495 }
496 496
497 void HttpProxyClientSocketPool::AddLayeredPool(LayeredPool* layered_pool) { 497 void HttpProxyClientSocketPool::AddLayeredPool(LayeredPool* layered_pool) {
498 base_.AddLayeredPool(layered_pool); 498 base_.AddLayeredPool(layered_pool);
499 } 499 }
500 500
501 void HttpProxyClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) { 501 void HttpProxyClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) {
502 base_.RemoveLayeredPool(layered_pool); 502 base_.RemoveLayeredPool(layered_pool);
503 } 503 }
504 504
505 DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue( 505 base::DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue(
506 const std::string& name, 506 const std::string& name,
507 const std::string& type, 507 const std::string& type,
508 bool include_nested_pools) const { 508 bool include_nested_pools) const {
509 DictionaryValue* dict = base_.GetInfoAsValue(name, type); 509 base::DictionaryValue* dict = base_.GetInfoAsValue(name, type);
510 if (include_nested_pools) { 510 if (include_nested_pools) {
511 ListValue* list = new ListValue(); 511 base::ListValue* list = new base::ListValue();
512 if (transport_pool_) { 512 if (transport_pool_) {
513 list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool", 513 list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool",
514 "transport_socket_pool", 514 "transport_socket_pool",
515 true)); 515 true));
516 } 516 }
517 if (ssl_pool_) { 517 if (ssl_pool_) {
518 list->Append(ssl_pool_->GetInfoAsValue("ssl_socket_pool", 518 list->Append(ssl_pool_->GetInfoAsValue("ssl_socket_pool",
519 "ssl_socket_pool", 519 "ssl_socket_pool",
520 true)); 520 true));
521 } 521 }
(...skipping 10 matching lines...) Expand all
532 return base_.histograms(); 532 return base_.histograms();
533 } 533 }
534 534
535 bool HttpProxyClientSocketPool::CloseOneIdleConnection() { 535 bool HttpProxyClientSocketPool::CloseOneIdleConnection() {
536 if (base_.CloseOneIdleSocket()) 536 if (base_.CloseOneIdleSocket())
537 return true; 537 return true;
538 return base_.CloseOneIdleConnectionInLayeredPool(); 538 return base_.CloseOneIdleConnectionInLayeredPool();
539 } 539 }
540 540
541 } // namespace net 541 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_pipelined_host_pool.cc ('k') | net/http/http_request_headers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698