Index: remoting/protocol/jingle_session.h |
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h |
index 9ec62069fefc4040c10fba0d7691b5abe22b8a12..dfb96cb462bbbe10896350b468a799420cb07c01 100644 |
--- a/remoting/protocol/jingle_session.h |
+++ b/remoting/protocol/jingle_session.h |
@@ -15,7 +15,7 @@ |
#include "crypto/rsa_private_key.h" |
#include "net/base/completion_callback.h" |
#include "remoting/protocol/authenticator.h" |
-#include "remoting/protocol/datagram_channel_factory.h" |
+#include "remoting/protocol/channel_factory.h" |
#include "remoting/protocol/jingle_messages.h" |
#include "remoting/protocol/session.h" |
#include "remoting/protocol/session_config.h" |
@@ -30,17 +30,14 @@ |
namespace remoting { |
namespace protocol { |
-class SecureChannelFactory; |
class ChannelMultiplexer; |
class JingleSessionManager; |
-class PseudoTcpChannelFactory; |
// JingleSessionManager and JingleSession implement the subset of the |
// Jingle protocol used in Chromoting. Instances of this class are |
// created by the JingleSessionManager. |
-class JingleSession : public base::NonThreadSafe, |
- public Session, |
- public DatagramChannelFactory, |
+class JingleSession : public Session, |
+ public ChannelFactory, |
public Transport::EventHandler { |
public: |
virtual ~JingleSession(); |
@@ -52,11 +49,11 @@ |
virtual const CandidateSessionConfig* candidate_config() OVERRIDE; |
virtual const SessionConfig& config() OVERRIDE; |
virtual void set_config(const SessionConfig& config) OVERRIDE; |
- virtual StreamChannelFactory* GetTransportChannelFactory() OVERRIDE; |
- virtual StreamChannelFactory* GetMultiplexedChannelFactory() OVERRIDE; |
+ virtual ChannelFactory* GetTransportChannelFactory() OVERRIDE; |
+ virtual ChannelFactory* GetMultiplexedChannelFactory() OVERRIDE; |
virtual void Close() OVERRIDE; |
- // DatagramChannelFactory interface. |
+ // ChannelFactory interface. |
virtual void CreateChannel(const std::string& name, |
const ChannelCreatedCallback& callback) OVERRIDE; |
virtual void CancelChannelCreation(const std::string& name) OVERRIDE; |
@@ -136,9 +133,6 @@ |
// Called after the authenticating step is finished. |
void ContinueAuthenticationStep(); |
- // Called when authentication is finished. |
- void OnAuthenticated(); |
- |
// Terminates the session and sends session-terminate if it is |
// necessary. |error| specifies the error code in case when the |
// session is being closed due to an error. |
@@ -171,8 +165,6 @@ |
std::list<IqRequest*> transport_info_requests_; |
ChannelsMap channels_; |
- scoped_ptr<PseudoTcpChannelFactory> pseudotcp_channel_factory_; |
- scoped_ptr<SecureChannelFactory> secure_channel_factory_; |
scoped_ptr<ChannelMultiplexer> channel_multiplexer_; |
base::OneShotTimer<JingleSession> transport_infos_timer_; |