diff options
author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /net/socket_stream/socket_stream_job_manager.cc | |
parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'net/socket_stream/socket_stream_job_manager.cc')
-rw-r--r-- | net/socket_stream/socket_stream_job_manager.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/socket_stream/socket_stream_job_manager.cc b/net/socket_stream/socket_stream_job_manager.cc index 7dd0d6b..de2f0a8 100644 --- a/net/socket_stream/socket_stream_job_manager.cc +++ b/net/socket_stream/socket_stream_job_manager.cc @@ -4,6 +4,8 @@ #include "net/socket_stream/socket_stream_job_manager.h" +#include "base/singleton.h" + namespace net { SocketStreamJobManager::SocketStreamJobManager() { @@ -12,6 +14,11 @@ SocketStreamJobManager::SocketStreamJobManager() { SocketStreamJobManager::~SocketStreamJobManager() { } +// static +SocketStreamJobManager* SocketStreamJobManager::GetInstance() { + return Singleton<SocketStreamJobManager>::get(); +} + SocketStreamJob* SocketStreamJobManager::CreateJob( const GURL& url, SocketStream::Delegate* delegate) const { // If url is invalid, create plain SocketStreamJob, which will close |