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

Side by Side Diff: content/browser/renderer_host/p2p/socket_host_tcp_server.h

Issue 7149008: Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2) (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix nits Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_SERVER_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_SERVER_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_SERVER_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_SERVER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector>
9 10
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop.h" 13 #include "base/message_loop.h"
12 #include "base/scoped_ptr.h"
13 #include "content/browser/renderer_host/p2p/socket_host.h" 14 #include "content/browser/renderer_host/p2p/socket_host.h"
14 #include "content/common/p2p_sockets.h" 15 #include "content/common/p2p_sockets.h"
15 #include "net/socket/tcp_server_socket.h" 16 #include "net/socket/tcp_server_socket.h"
16 17
17 namespace net { 18 namespace net {
18 class StreamSocket; 19 class StreamSocket;
19 } // namespace net 20 } // namespace net
20 21
21 class P2PSocketHostTcpServer : public P2PSocketHost { 22 class P2PSocketHostTcpServer : public P2PSocketHost {
22 public: 23 public:
(...skipping 27 matching lines...) Expand all
50 51
51 scoped_ptr<net::StreamSocket> accept_socket_; 52 scoped_ptr<net::StreamSocket> accept_socket_;
52 AcceptedSocketsMap accepted_sockets_; 53 AcceptedSocketsMap accepted_sockets_;
53 54
54 net::CompletionCallbackImpl<P2PSocketHostTcpServer> accept_callback_; 55 net::CompletionCallbackImpl<P2PSocketHostTcpServer> accept_callback_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(P2PSocketHostTcpServer); 57 DISALLOW_COPY_AND_ASSIGN(P2PSocketHostTcpServer);
57 }; 58 };
58 59
59 #endif // CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_SERVER_H_ 60 #endif // CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_SERVER_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_tcp.h ('k') | content/browser/renderer_host/p2p/socket_host_udp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698