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

Unified Diff: remoting/client/plugin/pepper_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/client/plugin/pepper_port_allocator.h ('k') | remoting/host/host_port_allocator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/pepper_port_allocator.cc
===================================================================
--- remoting/client/plugin/pepper_port_allocator.cc (revision 146359)
+++ remoting/client/plugin/pepper_port_allocator.cc (working copy)
@@ -32,6 +32,7 @@
public:
PepperPortAllocatorSession(
cricket::HttpPortAllocatorBase* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password,
@@ -74,6 +75,7 @@
PepperPortAllocatorSession::PepperPortAllocatorSession(
cricket::HttpPortAllocatorBase* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password,
@@ -82,7 +84,7 @@
const std::string& relay_token,
const pp::InstanceHandle& instance)
: HttpPortAllocatorSessionBase(
- allocator, component, ice_username_fragment, ice_password,
+ allocator, content_name, component, ice_username_fragment, ice_password,
stun_hosts, relay_hosts, relay_token, ""),
instance_(instance),
stun_address_resolver_(instance_),
@@ -336,11 +338,12 @@
}
cricket::PortAllocatorSession* PepperPortAllocator::CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) {
return new PepperPortAllocatorSession(
- this, component, ice_username_fragment, ice_password,
+ this, content_name, component, ice_username_fragment, ice_password,
stun_hosts(), relay_hosts(), relay_token(), instance_);
}
« no previous file with comments | « remoting/client/plugin/pepper_port_allocator.h ('k') | remoting/host/host_port_allocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698