Index: remoting/protocol/connection_to_host.h |
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h |
index 8a2385ae44f2211a00bc84e912c69090248095c9..a7ce529eb65ccdfb476467aa508e3b6f6f74317f 100644 |
--- a/remoting/protocol/connection_to_host.h |
+++ b/remoting/protocol/connection_to_host.h |
@@ -117,7 +117,9 @@ class ConnectionToHost : public SignalStrategy::StatusObserver, |
// Callback for |session_|. |
void OnSessionStateChange(Session::State state); |
- // Callback for VideoReader::Init(). |
+ // Callbacks for channel initialization |
+ void OnControlChannelInitialized(bool successful); |
+ void OnEventChannelInitialized(bool successful); |
void OnVideoChannelInitialized(bool successful); |
void NotifyIfChannelsReady(); |
@@ -153,16 +155,16 @@ class ConnectionToHost : public SignalStrategy::StatusObserver, |
scoped_ptr<VideoReader> video_reader_; |
scoped_ptr<ClientControlDispatcher> control_dispatcher_; |
- scoped_ptr<ClientEventDispatcher> input_dispatcher_; |
+ scoped_ptr<ClientEventDispatcher> event_dispatcher_; |
// Internal state of the connection. |
State state_; |
Error error_; |
// State of the channels. |
- bool control_connected_; |
- bool input_connected_; |
- bool video_connected_; |
+ bool control_channel_connected_; |
+ bool event_channel_connected_; |
+ bool video_channel_connected_; |
private: |
DISALLOW_COPY_AND_ASSIGN(ConnectionToHost); |