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

Side by Side Diff: net/socket_stream/socket_stream_job_manager.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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/socket/ssl_client_socket_win.cc ('k') | net/socket_stream/socket_stream_job_manager.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef NET_SOCKET_STREAM_SOCKET_STREAM_JOB_MANAGER_H_ 5 #ifndef NET_SOCKET_STREAM_SOCKET_STREAM_JOB_MANAGER_H_
6 #define NET_SOCKET_STREAM_SOCKET_STREAM_JOB_MANAGER_H_ 6 #define NET_SOCKET_STREAM_SOCKET_STREAM_JOB_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 17 matching lines...) Expand all
28 SocketStreamJob::ProtocolFactory* RegisterProtocolFactory( 28 SocketStreamJob::ProtocolFactory* RegisterProtocolFactory(
29 const std::string& scheme, SocketStreamJob::ProtocolFactory* factory); 29 const std::string& scheme, SocketStreamJob::ProtocolFactory* factory);
30 30
31 private: 31 private:
32 friend struct DefaultSingletonTraits<SocketStreamJobManager>; 32 friend struct DefaultSingletonTraits<SocketStreamJobManager>;
33 typedef std::map<std::string, SocketStreamJob::ProtocolFactory*> FactoryMap; 33 typedef std::map<std::string, SocketStreamJob::ProtocolFactory*> FactoryMap;
34 34
35 SocketStreamJobManager(); 35 SocketStreamJobManager();
36 ~SocketStreamJobManager(); 36 ~SocketStreamJobManager();
37 37
38 mutable Lock lock_; 38 mutable base::Lock lock_;
39 FactoryMap factories_; 39 FactoryMap factories_;
40 40
41 DISALLOW_COPY_AND_ASSIGN(SocketStreamJobManager); 41 DISALLOW_COPY_AND_ASSIGN(SocketStreamJobManager);
42 }; 42 };
43 43
44 } // namespace net 44 } // namespace net
45 45
46 #endif // NET_SOCKET_STREAM_SOCKET_STREAM_JOB_MANAGER_H_ 46 #endif // NET_SOCKET_STREAM_SOCKET_STREAM_JOB_MANAGER_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_win.cc ('k') | net/socket_stream/socket_stream_job_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698