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

Side by Side Diff: net/socket/ssl_client_socket_nss.h

Issue 8889036: Revert 113699 - base::Bind: Convert Socket::Write. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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_mac.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
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_SSL_CLIENT_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <certt.h> 9 #include <certt.h>
10 #include <keyt.h> 10 #include <keyt.h>
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // Socket implementation. 89 // Socket implementation.
90 virtual int Read(IOBuffer* buf, 90 virtual int Read(IOBuffer* buf,
91 int buf_len, 91 int buf_len,
92 OldCompletionCallback* callback) OVERRIDE; 92 OldCompletionCallback* callback) OVERRIDE;
93 virtual int Read(IOBuffer* buf, 93 virtual int Read(IOBuffer* buf,
94 int buf_len, 94 int buf_len,
95 const CompletionCallback& callback) OVERRIDE; 95 const CompletionCallback& callback) OVERRIDE;
96 virtual int Write(IOBuffer* buf, 96 virtual int Write(IOBuffer* buf,
97 int buf_len, 97 int buf_len,
98 OldCompletionCallback* callback) OVERRIDE; 98 OldCompletionCallback* callback) OVERRIDE;
99 virtual int Write(IOBuffer* buf,
100 int buf_len,
101 const CompletionCallback& callback) OVERRIDE;
102 virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; 99 virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
103 virtual bool SetSendBufferSize(int32 size) OVERRIDE; 100 virtual bool SetSendBufferSize(int32 size) OVERRIDE;
104 101
105 private: 102 private:
106 enum State { 103 enum State {
107 STATE_NONE, 104 STATE_NONE,
108 STATE_LOAD_SSL_HOST_INFO, 105 STATE_LOAD_SSL_HOST_INFO,
109 STATE_HANDSHAKE, 106 STATE_HANDSHAKE,
110 STATE_GET_OB_CERT_COMPLETE, 107 STATE_GET_OB_CERT_COMPLETE,
111 STATE_VERIFY_DNSSEC, 108 STATE_VERIFY_DNSSEC,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 226
230 CompletionCallback handshake_io_callback_; 227 CompletionCallback handshake_io_callback_;
231 scoped_ptr<ClientSocketHandle> transport_; 228 scoped_ptr<ClientSocketHandle> transport_;
232 HostPortPair host_and_port_; 229 HostPortPair host_and_port_;
233 SSLConfig ssl_config_; 230 SSLConfig ssl_config_;
234 231
235 OldCompletionCallback* old_user_connect_callback_; 232 OldCompletionCallback* old_user_connect_callback_;
236 CompletionCallback user_connect_callback_; 233 CompletionCallback user_connect_callback_;
237 OldCompletionCallback* old_user_read_callback_; 234 OldCompletionCallback* old_user_read_callback_;
238 CompletionCallback user_read_callback_; 235 CompletionCallback user_read_callback_;
239 OldCompletionCallback* old_user_write_callback_; 236 OldCompletionCallback* user_write_callback_;
240 CompletionCallback user_write_callback_;
241 237
242 // Used by Read function. 238 // Used by Read function.
243 scoped_refptr<IOBuffer> user_read_buf_; 239 scoped_refptr<IOBuffer> user_read_buf_;
244 int user_read_buf_len_; 240 int user_read_buf_len_;
245 241
246 // Used by Write function. 242 // Used by Write function.
247 scoped_refptr<IOBuffer> user_write_buf_; 243 scoped_refptr<IOBuffer> user_write_buf_;
248 int user_write_buf_len_; 244 int user_write_buf_len_;
249 245
250 // Set when handshake finishes. The server certificate is first received 246 // Set when handshake finishes. The server certificate is first received
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 // Added the following code Debugging in release mode. 318 // Added the following code Debugging in release mode.
323 mutable base::Lock lock_; 319 mutable base::Lock lock_;
324 // This is mutable so that CalledOnValidThread can set it. 320 // This is mutable so that CalledOnValidThread can set it.
325 // It's guarded by |lock_|. 321 // It's guarded by |lock_|.
326 mutable base::PlatformThreadId valid_thread_id_; 322 mutable base::PlatformThreadId valid_thread_id_;
327 }; 323 };
328 324
329 } // namespace net 325 } // namespace net
330 326
331 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 327 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_mac.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698