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

Unified Diff: remoting/protocol/jingle_session_manager.h

Issue 7312013: Minor cleanups in JingleSession and JingleSessionManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 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/protocol/jingle_session.cc ('k') | remoting/protocol/jingle_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_manager.h
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h
index e629f40e1601e4acb21bc1766bc42a9825c84974..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,6 +78,11 @@ class JingleSessionManager
private:
friend class JingleSession;
+ 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,
@@ -84,13 +91,6 @@ class JingleSessionManager
// 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,
« no previous file with comments | « remoting/protocol/jingle_session.cc ('k') | remoting/protocol/jingle_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698