| Index: remoting/protocol/channel_dispatcher_base.h
|
| diff --git a/remoting/protocol/channel_dispatcher_base.h b/remoting/protocol/channel_dispatcher_base.h
|
| index 0c80b30c5a3758a82853be5338d64d323de05c4d..539213d8edffa9b2227362503cddfcf3c287797c 100644
|
| --- a/remoting/protocol/channel_dispatcher_base.h
|
| +++ b/remoting/protocol/channel_dispatcher_base.h
|
| @@ -13,6 +13,7 @@
|
| #include "remoting/protocol/buffered_socket_writer.h"
|
| #include "remoting/protocol/errors.h"
|
| #include "remoting/protocol/message_reader.h"
|
| +#include "remoting/protocol/session_config.h"
|
|
|
| namespace net {
|
| class StreamSocket;
|
| @@ -21,7 +22,6 @@ class StreamSocket;
|
| namespace remoting {
|
| namespace protocol {
|
|
|
| -struct ChannelConfig;
|
| class StreamChannelFactory;
|
| class Session;
|
|
|
| @@ -62,8 +62,12 @@ class ChannelDispatcherBase {
|
| protected:
|
| explicit ChannelDispatcherBase(const char* channel_name);
|
|
|
| + // Calls event_handler_->OnChannelError() with the supplied |error|.
|
| + void NotifyError(ErrorCode error);
|
| +
|
| BufferedSocketWriter* writer() { return &writer_; }
|
| MessageReader* reader() { return &reader_; }
|
| + const ChannelConfig& channel_config() { return channel_config_; }
|
|
|
| private:
|
| void OnChannelReady(scoped_ptr<net::StreamSocket> socket);
|
| @@ -71,6 +75,7 @@ class ChannelDispatcherBase {
|
|
|
| std::string channel_name_;
|
| StreamChannelFactory* channel_factory_;
|
| + ChannelConfig channel_config_;
|
| EventHandler* event_handler_;
|
| scoped_ptr<net::StreamSocket> channel_;
|
|
|
|
|