diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 14:53:38 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 14:53:38 +0000 |
| commit | ba00b49d134df5d468ddd62d21ab33d7401b59fa (patch) | |
| tree | 23eacf227cedb4f76affd0f4c08d31be889a24bd /net/socket/socks_client_socket_pool.h | |
| parent | 0982e5893e97489a3c9038e5d957b1403d6a62c1 (diff) | |
| download | chromium_src-ba00b49d134df5d468ddd62d21ab33d7401b59fa.zip chromium_src-ba00b49d134df5d468ddd62d21ab33d7401b59fa.tar.gz chromium_src-ba00b49d134df5d468ddd62d21ab33d7401b59fa.tar.bz2 | |
Add missing nested socket pools to socket pool info page. Each socket pool should be displayed once and only once. Also, if more than one proxy is in use, socket pools with the same proxy will appear adjacent to each other.
BUG=39756
TEST=manual
Review URL: http://codereview.chromium.org/3328009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_pool.h')
| -rw-r--r-- | net/socket/socks_client_socket_pool.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h index 418d38c..0bea2cc 100644 --- a/net/socket/socks_client_socket_pool.h +++ b/net/socket/socks_client_socket_pool.h @@ -140,10 +140,9 @@ class SOCKSClientSocketPool : public ClientSocketPool { virtual LoadState GetLoadState(const std::string& group_name, const ClientSocketHandle* handle) const; - virtual Value* GetInfoAsValue(const std::string& name, - const std::string& type) const { - return base_.GetInfoAsValue(name, type); - } + virtual DictionaryValue* GetInfoAsValue(const std::string& name, + const std::string& type, + bool include_nested_pools) const; virtual base::TimeDelta ConnectionTimeout() const { return base_.ConnectionTimeout(); @@ -186,6 +185,7 @@ class SOCKSClientSocketPool : public ClientSocketPool { DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJobFactory); }; + const scoped_refptr<TCPClientSocketPool> tcp_pool_; PoolBase base_; DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool); |