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

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

Issue 10689180: Rolling libjingle to 158:159 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « content/renderer/p2p/port_allocator.h ('k') | jingle/glue/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/p2p/port_allocator.cc
===================================================================
--- content/renderer/p2p/port_allocator.cc (revision 146359)
+++ content/renderer/p2p/port_allocator.cc (working copy)
@@ -70,20 +70,22 @@
}
cricket::PortAllocatorSession* P2PPortAllocator::CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) {
return new P2PPortAllocatorSession(
- this, component, ice_username_fragment, ice_password);
+ this, content_name, component, ice_username_fragment, ice_password);
}
P2PPortAllocatorSession::P2PPortAllocatorSession(
P2PPortAllocator* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password)
: cricket::BasicPortAllocatorSession(
- allocator, component,
+ allocator, content_name, component,
ice_username_fragment, ice_password),
allocator_(allocator),
relay_session_attempts_(0),
« no previous file with comments | « content/renderer/p2p/port_allocator.h ('k') | jingle/glue/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698