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

Unified Diff: remoting/protocol/jingle_session.cc

Issue 550383002: Cleanup ChannelFactory interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session.cc
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 501e6afab304cba96ed2cbc529905d385bce22f1..3638e893746c280b8c1f1a8cbf1125d15309fd1d 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -250,9 +250,8 @@ void JingleSession::AddPendingRemoteCandidates(Transport* channel,
}
}
-void JingleSession::CreateStreamChannel(
- const std::string& name,
- const StreamChannelCallback& callback) {
+void JingleSession::CreateChannel(const std::string& name,
+ const ChannelCreatedCallback& callback) {
DCHECK(!channels_[name]);
scoped_ptr<ChannelAuthenticator> channel_authenticator =
@@ -265,21 +264,6 @@ void JingleSession::CreateStreamChannel(
channels_[name] = channel.release();
}
-void JingleSession::CreateDatagramChannel(
- const std::string& name,
- const DatagramChannelCallback& callback) {
- DCHECK(!channels_[name]);
-
- scoped_ptr<ChannelAuthenticator> channel_authenticator =
- authenticator_->CreateChannelAuthenticator();
- scoped_ptr<DatagramTransport> channel =
- session_manager_->transport_factory_->CreateDatagramTransport();
- channel->Initialize(name, this, channel_authenticator.Pass());
- channel->Connect(callback);
- AddPendingRemoteCandidates(channel.get(), name);
- channels_[name] = channel.release();
-}
-
void JingleSession::CancelChannelCreation(const std::string& name) {
ChannelsMap::iterator it = channels_.find(name);
if (it != channels_.end() && !it->second->is_connected()) {
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698