net/socket/ssl_client_socket_pool.cc - Issue 15662008: Make net and ipc explicitly use the base namespace for Values.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/ssl_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:

Index: net/socket/ssl_client_socket_pool.cc

diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc

index e9b9ec5193408031fdc920b50725a63eeaeedef8..b212b01a3789ceb2f32729dd2e7319374c6e0174 100644

--- a/net/socket/ssl_client_socket_pool.cc

+++ b/net/socket/ssl_client_socket_pool.cc

@@ -583,13 +583,13 @@ void SSLClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) {

base_.RemoveLayeredPool(layered_pool);

}

-DictionaryValue* SSLClientSocketPool::GetInfoAsValue(

+base::DictionaryValue* SSLClientSocketPool::GetInfoAsValue(

const std::string& name,

const std::string& type,

bool include_nested_pools) const {

- DictionaryValue* dict = base_.GetInfoAsValue(name, type);

+ base::DictionaryValue* dict = base_.GetInfoAsValue(name, type);

if (include_nested_pools) {

- ListValue* list = new ListValue();

+ base::ListValue* list = new base::ListValue();

if (transport_pool_) {

list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool",

"transport_socket_pool",

« no previous file with comments | « net/socket/socks_client_socket_pool.cc ('k') | net/socket/ssl_error_params.cc » ('j') | no next file with comments »