summaryrefslogtreecommitdiffstats
path: root/remoting/client
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 00:55:18 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 00:55:18 +0000
commit1635de0fadc0a867187208769d37e466a8e9914f (patch)
tree90e970ed50159a62164e51d5df28175215faf8b5 /remoting/client
parente321a3c8eef6418c248743fdb68aa8bbba02e98f (diff)
downloadchromium_src-1635de0fadc0a867187208769d37e466a8e9914f.zip
chromium_src-1635de0fadc0a867187208769d37e466a8e9914f.tar.gz
chromium_src-1635de0fadc0a867187208769d37e466a8e9914f.tar.bz2
Remove old tunneling code from remoting/jingle_glue.
BUG=None TEST=None Review URL: http://codereview.chromium.org/3574014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
-rw-r--r--remoting/client/jingle_host_connection.cc20
-rw-r--r--remoting/client/jingle_host_connection.h9
2 files changed, 3 insertions, 26 deletions
diff --git a/remoting/client/jingle_host_connection.cc b/remoting/client/jingle_host_connection.cc
index a4519df..044c9ee 100644
--- a/remoting/client/jingle_host_connection.cc
+++ b/remoting/client/jingle_host_connection.cc
@@ -117,26 +117,6 @@ void JingleHostConnection::OnStateChange(JingleClient* client,
}
}
-bool JingleHostConnection::OnAcceptConnection(
- JingleClient* client,
- const std::string& jid,
- JingleChannel::Callback** callback) {
- DCHECK_EQ(message_loop(), MessageLoop::current());
-
- // Client rejects all connection.
- return false;
-}
-
-void JingleHostConnection::OnNewConnection(
- JingleClient* client,
- scoped_refptr<JingleChannel> channel) {
- DCHECK_EQ(message_loop(), MessageLoop::current());
-
- // TODO(ajwong): Should we log more aggressively on this and above? We
- // shouldn't be getting any inbound connections.
- NOTREACHED() << "Clients can't accept inbound connections.";
-}
-
void JingleHostConnection::OnNewChromotocolConnection(
ChromotingConnection* connection, bool* accept) {
DCHECK_EQ(message_loop(), MessageLoop::current());
diff --git a/remoting/client/jingle_host_connection.h b/remoting/client/jingle_host_connection.h
index bbbbcab..1701b5b 100644
--- a/remoting/client/jingle_host_connection.h
+++ b/remoting/client/jingle_host_connection.h
@@ -5,8 +5,9 @@
// JingleHostConnection implements the HostConnection interface using
// libjingle as the transport protocol.
//
-// Much of this class focuses on translating JingleClient and JingleChannel
-// callbacks into HostConnection::HostEventCallback messages.
+// Much of this class focuses on translating JingleClient and
+// ChromotingConnection callbacks into HostConnection::HostEventCallback
+// messages.
//
// The public API of this class is designed to be asynchronous, and thread
// safe for invocation from other threads.
@@ -51,10 +52,6 @@ class JingleHostConnection : public HostConnection,
// JingleClient::Callback interface.
virtual void OnStateChange(JingleClient* client, JingleClient::State state);
- virtual bool OnAcceptConnection(JingleClient* client, const std::string& jid,
- JingleChannel::Callback** callback);
- void OnNewConnection(JingleClient* client,
- scoped_refptr<JingleChannel> channel);
// Callback for ChromotingServer.
void OnNewChromotocolConnection(