summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/channel_dispatcher_base.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-18 04:17:23 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-18 04:17:23 +0000
commit3e9187d08a26fb43a360a468c18b670bae2dd3b0 (patch)
tree7e3f0071f447b2ef76c2e6d11c08a9bc25e90911 /remoting/protocol/channel_dispatcher_base.h
parent2c539b896f7cd8e1ff6a1209418a5c7d15b3b6bc (diff)
downloadchromium_src-3e9187d08a26fb43a360a468c18b670bae2dd3b0.zip
chromium_src-3e9187d08a26fb43a360a468c18b670bae2dd3b0.tar.gz
chromium_src-3e9187d08a26fb43a360a468c18b670bae2dd3b0.tar.bz2
Add support for multiplexed channels in remoting::protocol::Session interface.
Now the Session interface has two methods that return channel factories - one for regular channels and one for multiplexed channels. Also refactored AudioReader and AudioWriter to inherit from ChannelDispatcherBase. BUG=137135 Review URL: https://chromiumcodereview.appspot.com/10823323 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/channel_dispatcher_base.h')
-rw-r--r--remoting/protocol/channel_dispatcher_base.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/protocol/channel_dispatcher_base.h b/remoting/protocol/channel_dispatcher_base.h
index 999b2b93..3a663fe 100644
--- a/remoting/protocol/channel_dispatcher_base.h
+++ b/remoting/protocol/channel_dispatcher_base.h
@@ -18,6 +18,7 @@ class StreamSocket;
namespace remoting {
namespace protocol {
+class ChannelFactory;
class Session;
// Base class for channel message dispatchers. It's responsible for
@@ -52,7 +53,7 @@ class ChannelDispatcherBase {
void OnChannelReady(scoped_ptr<net::StreamSocket> socket);
std::string channel_name_;
- Session* session_;
+ ChannelFactory* channel_factory_;
InitializedCallback initialized_callback_;
scoped_ptr<net::StreamSocket> channel_;