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

Side by Side Diff: content/renderer/p2p/p2p_transport_impl.cc

Issue 10209008: Roll libjingle 132:133 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/p2p/ipc_socket_factory.h ('k') | content/renderer/p2p/port_allocator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/p2p/p2p_transport_impl.h" 5 #include "content/renderer/p2p/p2p_transport_impl.h"
6 6
7 #include "content/renderer/p2p/ipc_network_manager.h" 7 #include "content/renderer/p2p/ipc_network_manager.h"
8 #include "content/renderer/p2p/ipc_socket_factory.h" 8 #include "content/renderer/p2p/ipc_socket_factory.h"
9 #include "content/renderer/p2p/port_allocator.h" 9 #include "content/renderer/p2p/port_allocator.h"
10 #include "jingle/glue/channel_socket_adapter.h" 10 #include "jingle/glue/channel_socket_adapter.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 socket_factory_.get(), config)); 68 socket_factory_.get(), config));
69 } else { 69 } else {
70 // Use BasicPortAllocator if we don't have P2PSocketDispatcher 70 // Use BasicPortAllocator if we don't have P2PSocketDispatcher
71 // (for unittests). 71 // (for unittests).
72 allocator_.reset(new cricket::BasicPortAllocator( 72 allocator_.reset(new cricket::BasicPortAllocator(
73 network_manager_.get(), socket_factory_.get())); 73 network_manager_.get(), socket_factory_.get()));
74 } 74 }
75 75
76 DCHECK(!channel_.get()); 76 DCHECK(!channel_.get());
77 channel_.reset(new cricket::P2PTransportChannel( 77 channel_.reset(new cricket::P2PTransportChannel(
78 name, "", NULL, allocator_.get())); 78 name, 0, NULL, allocator_.get()));
79 channel_->SignalRequestSignaling.connect( 79 channel_->SignalRequestSignaling.connect(
80 this, &P2PTransportImpl::OnRequestSignaling); 80 this, &P2PTransportImpl::OnRequestSignaling);
81 channel_->SignalCandidateReady.connect( 81 channel_->SignalCandidateReady.connect(
82 this, &P2PTransportImpl::OnCandidateReady); 82 this, &P2PTransportImpl::OnCandidateReady);
83 83
84 if (protocol == PROTOCOL_UDP) { 84 if (protocol == PROTOCOL_UDP) {
85 channel_->SignalReadableState.connect( 85 channel_->SignalReadableState.connect(
86 this, &P2PTransportImpl::OnReadableState); 86 this, &P2PTransportImpl::OnReadableState);
87 channel_->SignalWritableState.connect( 87 channel_->SignalWritableState.connect(
88 this, &P2PTransportImpl::OnWriteableState); 88 this, &P2PTransportImpl::OnWriteableState);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 void P2PTransportImpl::OnTcpConnected(int result) { 160 void P2PTransportImpl::OnTcpConnected(int result) {
161 if (result < 0) { 161 if (result < 0) {
162 event_handler_->OnError(result); 162 event_handler_->OnError(result);
163 return; 163 return;
164 } 164 }
165 state_ = static_cast<State>(STATE_READABLE | STATE_WRITABLE); 165 state_ = static_cast<State>(STATE_READABLE | STATE_WRITABLE);
166 event_handler_->OnStateChange(state_); 166 event_handler_->OnStateChange(state_);
167 } 167 }
168 168
169 } // namespace content 169 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/p2p/ipc_socket_factory.h ('k') | content/renderer/p2p/port_allocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698