Skip to content

Commit

Permalink
Remove old tunneling code from remoting/jingle_glue.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
sergeyu@chromium.org committed Oct 14, 2010
1 parent e321a3c commit 1635de0
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 951 deletions.
20 changes: 0 additions & 20 deletions remoting/client/jingle_host_connection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
9 changes: 3 additions & 6 deletions remoting/client/jingle_host_connection.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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(
Expand Down
12 changes: 0 additions & 12 deletions remoting/host/chromoting_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "remoting/host/event_executor.h"
#include "remoting/host/host_config.h"
#include "remoting/host/session_manager.h"
#include "remoting/jingle_glue/jingle_channel.h"
#include "remoting/protocol/messages_decoder.h"
#include "remoting/protocol/jingle_chromoting_server.h"

Expand Down Expand Up @@ -263,17 +262,6 @@ void ChromotingHost::OnNewClientConnection(
client_->Init(connection);
}

bool ChromotingHost::OnAcceptConnection(
JingleClient* jingle_client, const std::string& jid,
JingleChannel::Callback** channel_callback) {
return false;
}

void ChromotingHost::OnNewConnection(JingleClient* jingle_client,
scoped_refptr<JingleChannel> channel) {
NOTREACHED();
}

void ChromotingHost::OnServerClosed() {
// Don't need to do anything here.
}
Expand Down
6 changes: 0 additions & 6 deletions remoting/host/chromoting_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,6 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
////////////////////////////////////////////////////////////////////////////
// JingleClient::Callback implementations
virtual void OnStateChange(JingleClient* client, JingleClient::State state);
virtual bool OnAcceptConnection(
JingleClient* jingle, const std::string& jid,
JingleChannel::Callback** channel_callback);
virtual void OnNewConnection(
JingleClient* jingle,
scoped_refptr<JingleChannel> channel);

// Callback for ChromotingServer.
void OnNewClientConnection(ChromotingConnection* connection, bool* accept);
Expand Down
241 changes: 0 additions & 241 deletions remoting/jingle_glue/jingle_channel.cc

This file was deleted.

Loading

0 comments on commit 1635de0

Please sign in to comment.