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

Unified Diff: remoting/protocol/jingle_session_manager.h

Issue 10233021: Move PortAllocator creation out of LibjingleTransportFactory. (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
Index: remoting/protocol/jingle_session_manager.h
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h
index 1c4ab518b62379cc26d3e1fc713af661acd32b49..a44132bc54b38d4c49d9ee03aa89a4b05e64b501 100644
--- a/remoting/protocol/jingle_session_manager.h
+++ b/remoting/protocol/jingle_session_manager.h
@@ -45,14 +45,20 @@ class JingleSession;
class JingleSessionManager : public SessionManager,
public SignalStrategy::Listener {
public:
+ // When |fetch_nat_traversal_config| is set to true then
+ // JingleSessionManager will also try to query configuration of STUN
+ // and Relay servers from the signaling server.
+ //
+ // TODO(sergeyu): Move NAT-traversal config fetching to a separate
+ // class.
explicit JingleSessionManager(
- scoped_ptr<TransportFactory> transport_factory);
+ scoped_ptr<TransportFactory> transport_factory,
+ bool fetch_nat_traversal_config);
Wez 2012/04/27 17:58:51 nit: At a glance this name suggests it's fetching
Sergey Ulanov 2012/04/27 22:51:14 Renamed to fetch_stun_relay_config
virtual ~JingleSessionManager();
// SessionManager interface.
virtual void Init(SignalStrategy* signal_strategy,
- SessionManager::Listener* listener,
- const NetworkSettings& network_settings) OVERRIDE;
+ SessionManager::Listener* listener) OVERRIDE;
virtual scoped_ptr<Session> Connect(
const std::string& host_jid,
scoped_ptr<Authenticator> authenticator,
@@ -86,8 +92,10 @@ class JingleSessionManager : public SessionManager,
void SessionDestroyed(JingleSession* session);
scoped_ptr<TransportFactory> transport_factory_;
+ bool fetch_nat_traversal_config_;
SignalStrategy* signal_strategy_;
+ bool nat_travesal_;
Wez 2012/04/27 17:58:51 typo: nat_travesal_
Wez 2012/04/27 17:58:51 Name this |allow_nat_traversal_| or similar, to ex
Wez 2012/04/27 17:58:51 Is this used?
Sergey Ulanov 2012/04/27 22:51:14 Done.
Sergey Ulanov 2012/04/27 22:51:14 Done.
Sergey Ulanov 2012/04/27 22:51:14 No, removed it.
scoped_ptr<AuthenticatorFactory> authenticator_factory_;
scoped_ptr<IqSender> iq_sender_;
SessionManager::Listener* listener_;

Powered by Google App Engine
This is Rietveld 408576698