summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 20:10:45 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 20:10:45 +0000
commitddb1e5ae096bd91da721887fd55e68c603bf7067 (patch)
tree401d9a379ff03bb8b69a1ce9c23fe182f673f587 /remoting/jingle_glue
parent1c9526e0650a91e412d815417634c9f193b1a4d5 (diff)
downloadchromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.zip
chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.tar.gz
chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.tar.bz2
Even more virtual method deinlining.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5741001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
-rw-r--r--remoting/jingle_glue/ssl_socket_adapter.cc4
-rw-r--r--remoting/jingle_glue/ssl_socket_adapter.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/remoting/jingle_glue/ssl_socket_adapter.cc b/remoting/jingle_glue/ssl_socket_adapter.cc
index 45accf5..54955ab 100644
--- a/remoting/jingle_glue/ssl_socket_adapter.cc
+++ b/remoting/jingle_glue/ssl_socket_adapter.cc
@@ -234,6 +234,10 @@ int TransportSocket::GetPeerAddress(net::AddressList* address) const {
return net::OK;
}
+const net::BoundNetLog& TransportSocket::NetLog() const {
+ return net_log_;
+}
+
void TransportSocket::SetSubresourceSpeculation() {
NOTREACHED();
}
diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h
index 2843bda..6c80b26 100644
--- a/remoting/jingle_glue/ssl_socket_adapter.h
+++ b/remoting/jingle_glue/ssl_socket_adapter.h
@@ -42,7 +42,7 @@ class TransportSocket : public net::ClientSocket, public sigslot::has_slots<> {
virtual bool IsConnected() const;
virtual bool IsConnectedAndIdle() const;
virtual int GetPeerAddress(net::AddressList* address) const;
- virtual const net::BoundNetLog& NetLog() const { return net_log_; }
+ virtual const net::BoundNetLog& NetLog() const;
virtual void SetSubresourceSpeculation();
virtual void SetOmniboxSpeculation();
virtual bool WasEverUsed() const;