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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/socks5_client_socket.h" 5 #include "net/socket/socks5_client_socket.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 } 83 }
84 84
85 bool SOCKS5ClientSocket::IsConnected() const { 85 bool SOCKS5ClientSocket::IsConnected() const {
86 return completed_handshake_ && transport_->socket()->IsConnected(); 86 return completed_handshake_ && transport_->socket()->IsConnected();
87 } 87 }
88 88
89 bool SOCKS5ClientSocket::IsConnectedAndIdle() const { 89 bool SOCKS5ClientSocket::IsConnectedAndIdle() const {
90 return completed_handshake_ && transport_->socket()->IsConnectedAndIdle(); 90 return completed_handshake_ && transport_->socket()->IsConnectedAndIdle();
91 } 91 }
92 92
93 const BoundNetLog& SOCKS5ClientSocket::NetLog() const { 93 const NetLogWithSource& SOCKS5ClientSocket::NetLog() const {
94 return net_log_; 94 return net_log_;
95 } 95 }
96 96
97 void SOCKS5ClientSocket::SetSubresourceSpeculation() { 97 void SOCKS5ClientSocket::SetSubresourceSpeculation() {
98 if (transport_.get() && transport_->socket()) { 98 if (transport_.get() && transport_->socket()) {
99 transport_->socket()->SetSubresourceSpeculation(); 99 transport_->socket()->SetSubresourceSpeculation();
100 } else { 100 } else {
101 NOTREACHED(); 101 NOTREACHED();
102 } 102 }
103 } 103 }
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 500
501 int SOCKS5ClientSocket::GetPeerAddress(IPEndPoint* address) const { 501 int SOCKS5ClientSocket::GetPeerAddress(IPEndPoint* address) const {
502 return transport_->socket()->GetPeerAddress(address); 502 return transport_->socket()->GetPeerAddress(address);
503 } 503 }
504 504
505 int SOCKS5ClientSocket::GetLocalAddress(IPEndPoint* address) const { 505 int SOCKS5ClientSocket::GetLocalAddress(IPEndPoint* address) const {
506 return transport_->socket()->GetLocalAddress(address); 506 return transport_->socket()->GetLocalAddress(address);
507 } 507 }
508 508
509 } // namespace net 509 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698