summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/jingle_session.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 02:51:34 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 02:51:34 +0000
commitdee7ab58e1a59241891e85f43d2996b54c5ea7ec (patch)
tree8ad5431d969f29ace1ff3842f1909a62d9a7d96d /remoting/protocol/jingle_session.h
parentcec09ef0ecb8f5e2f2171797d27b7ea1a496ddfb (diff)
downloadchromium_src-dee7ab58e1a59241891e85f43d2996b54c5ea7ec.zip
chromium_src-dee7ab58e1a59241891e85f43d2996b54c5ea7ec.tar.gz
chromium_src-dee7ab58e1a59241891e85f43d2996b54c5ea7ec.tar.bz2
Simplify channel creation callbacks in remoting::Session interface.
Remove name parameters from StreamChannelCallback and DatagramChannelCallback. This argument is redundant: callback currying can be used instead where neccessary. BUG=None TEST=compiles. Review URL: http://codereview.chromium.org/7605018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_session.h')
-rw-r--r--remoting/protocol/jingle_session.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index 7ac6fac..e4e3a6f 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -124,9 +124,8 @@ class JingleSession : public protocol::Session,
// Callbacks for the channels created in JingleSession.
// TODO(sergeyu): Remove this method once *_channel() methods are
// removed from Session interface.
- void OnStreamChannelConnected(
- const std::string& name, net::StreamSocket* socket);
- void OnChannelConnected(const std::string& name, net::Socket* socket);
+ void OnChannelConnected(scoped_ptr<net::Socket>* socket_container,
+ net::StreamSocket* socket);
const cricket::ContentInfo* GetContentInfo() const;