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

Side by Side Diff: net/socket/tcp_socket_win.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "net/socket/tcp_socket.h" 5 #include "net/socket/tcp_socket.h"
6 #include "net/socket/tcp_socket_win.h" 6 #include "net/socket/tcp_socket_win.h"
7 7
8 #include <errno.h> 8 #include <errno.h>
9 #include <mstcpip.h> 9 #include <mstcpip.h>
10 10
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 : socket_(INVALID_SOCKET), 250 : socket_(INVALID_SOCKET),
251 socket_performance_watcher_(std::move(socket_performance_watcher)), 251 socket_performance_watcher_(std::move(socket_performance_watcher)),
252 accept_event_(WSA_INVALID_EVENT), 252 accept_event_(WSA_INVALID_EVENT),
253 accept_socket_(NULL), 253 accept_socket_(NULL),
254 accept_address_(NULL), 254 accept_address_(NULL),
255 waiting_connect_(false), 255 waiting_connect_(false),
256 waiting_read_(false), 256 waiting_read_(false),
257 waiting_write_(false), 257 waiting_write_(false),
258 connect_os_error_(0), 258 connect_os_error_(0),
259 logging_multiple_connect_attempts_(false), 259 logging_multiple_connect_attempts_(false),
260 net_log_(BoundNetLog::Make(net_log, NetLogSourceType::SOCKET)) { 260 net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::SOCKET)) {
261 net_log_.BeginEvent(NetLogEventType::SOCKET_ALIVE, 261 net_log_.BeginEvent(NetLogEventType::SOCKET_ALIVE,
262 source.ToEventParametersCallback()); 262 source.ToEventParametersCallback());
263 EnsureWinsockInit(); 263 EnsureWinsockInit();
264 } 264 }
265 265
266 TCPSocketWin::~TCPSocketWin() { 266 TCPSocketWin::~TCPSocketWin() {
267 Close(); 267 Close();
268 net_log_.EndEvent(NetLogEventType::SOCKET_ALIVE); 268 net_log_.EndEvent(NetLogEventType::SOCKET_ALIVE);
269 } 269 }
270 270
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 } 1007 }
1008 1008
1009 bool TCPSocketWin::GetEstimatedRoundTripTime(base::TimeDelta* out_rtt) const { 1009 bool TCPSocketWin::GetEstimatedRoundTripTime(base::TimeDelta* out_rtt) const {
1010 DCHECK(out_rtt); 1010 DCHECK(out_rtt);
1011 // TODO(bmcquade): Consider implementing using 1011 // TODO(bmcquade): Consider implementing using
1012 // GetPerTcpConnectionEStats/GetPerTcp6ConnectionEStats. 1012 // GetPerTcpConnectionEStats/GetPerTcp6ConnectionEStats.
1013 return false; 1013 return false;
1014 } 1014 }
1015 1015
1016 } // namespace net 1016 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698