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

Unified Diff: remoting/protocol/libjingle_transport_factory.h

Issue 10160012: Pass TransportConfig to TransportFactory instead of Transport. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/jingle_session_manager.cc ('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/protocol/libjingle_transport_factory.h
diff --git a/remoting/protocol/libjingle_transport_factory.h b/remoting/protocol/libjingle_transport_factory.h
index 0ea8fc6594ef277e663791fe4f88220faf34a057..fb47b0037fb7008c024c01edcc0be64a34078485 100644
--- a/remoting/protocol/libjingle_transport_factory.h
+++ b/remoting/protocol/libjingle_transport_factory.h
@@ -8,6 +8,7 @@
#include "remoting/protocol/transport.h"
namespace cricket {
+class HttpPortAllocatorBase;
class PortAllocator;
} // namespace cricket
@@ -24,7 +25,7 @@ class LibjingleTransportFactory : public TransportFactory {
LibjingleTransportFactory(
scoped_ptr<talk_base::NetworkManager> network_manager,
scoped_ptr<talk_base::PacketSocketFactory> socket_factory,
- scoped_ptr<cricket::PortAllocator> port_allocator,
+ scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator,
bool incoming_only);
// Creates BasicNetworkManager, BasicPacketSocketFactory and
@@ -33,12 +34,17 @@ class LibjingleTransportFactory : public TransportFactory {
virtual ~LibjingleTransportFactory();
+ // TransportFactory interface.
+ virtual void SetTransportConfig(const TransportConfig& config) OVERRIDE;
virtual scoped_ptr<StreamTransport> CreateStreamTransport() OVERRIDE;
virtual scoped_ptr<DatagramTransport> CreateDatagramTransport() OVERRIDE;
private:
scoped_ptr<talk_base::NetworkManager> network_manager_;
scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
+ // Points to the same port allocator as |port_allocator_| or NULL if
+ // |port_allocator_| is not HttpPortAllocatorBase.
+ cricket::HttpPortAllocatorBase* http_port_allocator_;
scoped_ptr<cricket::PortAllocator> port_allocator_;
bool incoming_only_;
« no previous file with comments | « remoting/protocol/jingle_session_manager.cc ('k') | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698