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

Unified Diff: content/renderer/p2p/port_allocator.cc

Issue 10382003: Changes needed to roll libjingle r141 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 7 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
Index: content/renderer/p2p/port_allocator.cc
===================================================================
--- content/renderer/p2p/port_allocator.cc (revision 135898)
+++ content/renderer/p2p/port_allocator.cc (working copy)
@@ -70,17 +70,23 @@
P2PPortAllocator::~P2PPortAllocator() {
}
-cricket::PortAllocatorSession* P2PPortAllocator::CreateSession(
+cricket::PortAllocatorSession* P2PPortAllocator::CreateSessionInternal(
const std::string& channel_name,
- int component) {
- return new P2PPortAllocatorSession(this, channel_name, component);
+ int component,
+ const std::string& ice_ufrag,
+ const std::string& ice_pwd) {
+ return new P2PPortAllocatorSession(
+ this, channel_name, component, ice_ufrag, ice_pwd);
}
P2PPortAllocatorSession::P2PPortAllocatorSession(
P2PPortAllocator* allocator,
const std::string& channel_name,
- int component)
- : cricket::BasicPortAllocatorSession(allocator, channel_name, component),
+ int component,
+ const std::string& ice_ufrag,
+ const std::string& ice_pwd)
+ : cricket::BasicPortAllocatorSession(
+ allocator, channel_name, component, ice_ufrag, ice_pwd),
allocator_(allocator),
relay_session_attempts_(0),
relay_udp_port_(0),

Powered by Google App Engine
This is Rietveld 408576698