diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 16:43:22 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 16:43:22 +0000 |
| commit | c85388defd2d94fa37b463972da9730a8b1c40a2 (patch) | |
| tree | 0701f976121701ec87264c57be4a589cd96c4cf1 /remoting | |
| parent | add85b9a6f767546abe44b18226151549bcd1be1 (diff) | |
| download | chromium_src-c85388defd2d94fa37b463972da9730a8b1c40a2.zip chromium_src-c85388defd2d94fa37b463972da9730a8b1c40a2.tar.gz chromium_src-c85388defd2d94fa37b463972da9730a8b1c40a2.tar.bz2 | |
Roll libjingle to r126.
- Implemented ROAP on top of JSEP.
- Added a new signal after PortAllocatorSesison discoves all candidates for
the channel.
TEST=try bots and apprtc.appspot.com
Review URL: https://chromiumcodereview.appspot.com/9727011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/libjingle_transport_factory.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc index 75f0452..f80be95 100644 --- a/remoting/protocol/libjingle_transport_factory.cc +++ b/remoting/protocol/libjingle_transport_factory.cc @@ -50,7 +50,7 @@ class LibjingleStreamTransport : public StreamTransport, virtual bool is_connected() const OVERRIDE; private: - void OnRequestSignaling(); + void OnRequestSignaling(cricket::TransportChannelImpl* channel); void OnCandidateReady(cricket::TransportChannelImpl* channel, const cricket::Candidate& candidate); void OnRouteChange(cricket::TransportChannel* channel, @@ -207,7 +207,8 @@ bool LibjingleStreamTransport::is_connected() const { return callback_.is_null(); } -void LibjingleStreamTransport::OnRequestSignaling() { +void LibjingleStreamTransport::OnRequestSignaling( + cricket::TransportChannelImpl* channel) { DCHECK(CalledOnValidThread()); channel_->OnSignalingReady(); } |