Index: remoting/protocol/jingle_session_manager.h |
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h |
index 7dcc703ae80cf4578c89c6b809329ec684e08944..0eda7cf0298aece90b46f7e252123661327f62b0 100644 |
--- a/remoting/protocol/jingle_session_manager.h |
+++ b/remoting/protocol/jingle_session_manager.h |
@@ -37,11 +37,13 @@ class JingleSessionManager |
: public SessionManager, |
public cricket::SessionClient { |
public: |
- JingleSessionManager( |
+ virtual ~JingleSessionManager(); |
+ |
+ static JingleSessionManager* CreateNotSandboxed(); |
+ static JingleSessionManager* CreateSandboxed( |
talk_base::NetworkManager* network_manager, |
talk_base::PacketSocketFactory* socket_factory, |
PortAllocatorSessionFactory* port_allocator_session_factory); |
- virtual ~JingleSessionManager(); |
// SessionManager interface. |
virtual void Init(const std::string& local_jid, |
@@ -76,20 +78,19 @@ class JingleSessionManager |
private: |
friend class JingleSession; |
- // Called by JingleSession when a new connection is initiated. |
- void AcceptConnection(JingleSession* jingle_session, |
+ JingleSessionManager( |
+ talk_base::NetworkManager* network_manager, |
+ talk_base::PacketSocketFactory* socket_factory, |
+ PortAllocatorSessionFactory* port_allocator_session_factory); |
+ |
+ // Called by JingleSession when a new connection is |
+ // initiated. Returns true if session is accepted. |
+ bool AcceptConnection(JingleSession* jingle_session, |
cricket::Session* cricket_session); |
// Called by JingleSession when it is being destroyed. |
void SessionDestroyed(JingleSession* jingle_session); |
- void DoConnect( |
- JingleSession* jingle_session, |
- const std::string& host_jid, |
- const std::string& host_public_key, |
- const std::string& client_token, |
- Session::StateChangeCallback* state_change_callback); |
- |
// Callback for JingleInfoRequest. |
void OnJingleInfo( |
const std::string& token, |