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..4a7234f71aa89052a0ff6954fd3c98181c6a426b 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; |
@@ -55,6 +55,7 @@ class ChannelDispatcherBase { |
EventHandler* event_handler); |
const std::string& channel_name() { return channel_name_; } |
+ const ChannelConfig& channel_config() { return channel_config_; } |
Wez
2015/01/21 01:35:38
Does this need to be public, or could it be protec
Sergey Ulanov
2015/01/29 01:33:28
Yes, it's better to make it protected. Done.
|
// Returns true if the channel is currently connected. |
bool is_connected() { return channel_ != nullptr; } |
@@ -62,6 +63,8 @@ class ChannelDispatcherBase { |
protected: |
explicit ChannelDispatcherBase(const char* channel_name); |
+ void NotifyError(ErrorCode error); |
Wez
2015/01/21 01:35:38
Do you need this, or could you just expose an even
Sergey Ulanov
2015/01/29 01:33:28
Yes, I think it's better to have this method inste
|
+ |
BufferedSocketWriter* writer() { return &writer_; } |
MessageReader* reader() { return &reader_; } |
@@ -71,6 +74,7 @@ class ChannelDispatcherBase { |
std::string channel_name_; |
StreamChannelFactory* channel_factory_; |
+ ChannelConfig channel_config_; |
EventHandler* event_handler_; |
scoped_ptr<net::StreamSocket> channel_; |