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

Side by Side Diff: net/socket/tcp_server_socket_win.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
« no previous file with comments | « net/socket/tcp_server_socket_unittest.cc ('k') | remoting/base/encoder_vp8_unittest.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) 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 NET_SOCKET_TCP_SERVER_SOCKET_WIN_H_ 5 #ifndef NET_SOCKET_TCP_SERVER_SOCKET_WIN_H_
6 #define NET_SOCKET_TCP_SERVER_SOCKET_WIN_H_ 6 #define NET_SOCKET_TCP_SERVER_SOCKET_WIN_H_
7 7
8 #include <winsock2.h> 8 #include <winsock2.h>
9 9
10 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 11 #include "base/message_loop.h"
11 #include "base/scoped_ptr.h"
12 #include "base/win/object_watcher.h" 12 #include "base/win/object_watcher.h"
13 #include "base/threading/non_thread_safe.h" 13 #include "base/threading/non_thread_safe.h"
14 #include "net/base/net_log.h" 14 #include "net/base/net_log.h"
15 #include "net/socket/server_socket.h" 15 #include "net/socket/server_socket.h"
16 16
17 namespace net { 17 namespace net {
18 18
19 class IPEndPoint; 19 class IPEndPoint;
20 20
21 class NET_TEST TCPServerSocketWin 21 class NET_TEST TCPServerSocketWin
(...skipping 25 matching lines...) Expand all
47 47
48 scoped_ptr<StreamSocket>* accept_socket_; 48 scoped_ptr<StreamSocket>* accept_socket_;
49 CompletionCallback* accept_callback_; 49 CompletionCallback* accept_callback_;
50 50
51 BoundNetLog net_log_; 51 BoundNetLog net_log_;
52 }; 52 };
53 53
54 } // namespace net 54 } // namespace net
55 55
56 #endif // NET_SOCKET_TCP_SERVER_SOCKET_WIN_H_ 56 #endif // NET_SOCKET_TCP_SERVER_SOCKET_WIN_H_
OLDNEW
« no previous file with comments | « net/socket/tcp_server_socket_unittest.cc ('k') | remoting/base/encoder_vp8_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698