remoting/protocol/jingle_session.h - Issue 7605018: Simplify channel creation callbacks in remoting::Session interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/protocol/jingle_session.h

Issue 7605018: Simplify channel creation callbacks in remoting::Session interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 4 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:

Index: remoting/protocol/jingle_session.h

diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h

index 7ac6facbcca950261ce0ca1d44f6325edd0ffcae..e4e3a6f1d37f18f3470a72fe580087b2e5ff6133 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;