Index: remoting/protocol/session.h |
diff --git a/remoting/protocol/session.h b/remoting/protocol/session.h |
index 7041486be037313ab8a98875647bdfd9d009b30d..e1b6879c58e97619e4ff49e07d81c806c70346d9 100644 |
--- a/remoting/protocol/session.h |
+++ b/remoting/protocol/session.h |
@@ -7,7 +7,6 @@ |
#include <string> |
-#include "remoting/protocol/channel_factory.h" |
#include "remoting/protocol/errors.h" |
#include "remoting/protocol/session_config.h" |
@@ -18,12 +17,13 @@ class IPEndPoint; |
namespace remoting { |
namespace protocol { |
+class ChannelFactory; |
struct TransportRoute; |
// Generic interface for Chromotocol connection used by both client and host. |
// Provides access to the connection channels, but doesn't depend on the |
// protocol used for each channel. |
-class Session : public ChannelFactory { |
+class Session { |
public: |
enum State { |
// Created, but not connecting yet. |
@@ -98,6 +98,12 @@ class Session : public ChannelFactory { |
// ChromotocolServer::IncomingConnectionCallback. |
virtual void set_config(const SessionConfig& config) = 0; |
+ // Return channel factories for the session. First one creates regular |
+ // channels, while the second one creates multiplexed channels. All |
+ // multiplexed channels work over a single regular channel. |
Wez
2012/08/18 00:30:36
Suggest reword:
"GetTransportChannelFactory return
Sergey Ulanov
2012/08/18 01:53:56
Done.
|
+ virtual ChannelFactory* GetTransportChannelFactory() = 0; |
+ virtual ChannelFactory* GetMultiplexedChannelFactory() = 0; |
+ |
// Closes connection. Callbacks are guaranteed not to be called |
// after this method returns. Must be called before the object is |
// destroyed, unless the state is set to FAILED or CLOSED. |