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

Unified Diff: remoting/host/host_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 | « remoting/host/host_port_allocator.h ('k') | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_port_allocator.cc
===================================================================
--- remoting/host/host_port_allocator.cc (revision 146359)
+++ remoting/host/host_port_allocator.cc (working copy)
@@ -25,6 +25,7 @@
public:
HostPortAllocatorSession(
cricket::HttpPortAllocatorBase* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password,
@@ -50,6 +51,7 @@
HostPortAllocatorSession::HostPortAllocatorSession(
cricket::HttpPortAllocatorBase* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password,
@@ -58,7 +60,7 @@
const std::string& relay,
const scoped_refptr<net::URLRequestContextGetter>& url_context)
: HttpPortAllocatorSessionBase(
- allocator, component, ice_username_fragment, ice_password,
+ allocator, content_name, component, ice_username_fragment, ice_password,
stun_hosts, relay_hosts, relay, ""),
url_context_(url_context) {
}
@@ -165,11 +167,12 @@
}
cricket::PortAllocatorSession* HostPortAllocator::CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) {
return new HostPortAllocatorSession(
- this, component, ice_username_fragment, ice_password,
+ this, content_name, component, ice_username_fragment, ice_password,
stun_hosts(), relay_hosts(), relay_token(), url_context_);
}
« no previous file with comments | « remoting/host/host_port_allocator.h ('k') | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698