| 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..c590da4dbcaf7f0d8c5c1d58c2c21cf15a331c71 100644
|
| --- a/remoting/protocol/connection_to_host.h
|
| +++ b/remoting/protocol/connection_to_host.h
|
| @@ -117,8 +117,8 @@ class ConnectionToHost : public SignalStrategy::StatusObserver,
|
| // Callback for |session_|.
|
| void OnSessionStateChange(Session::State state);
|
|
|
| - // Callback for VideoReader::Init().
|
| - void OnVideoChannelInitialized(bool successful);
|
| + // Callbacks for channel initialization
|
| + void OnChannelInitialized(bool successful);
|
|
|
| void NotifyIfChannelsReady();
|
|
|
| @@ -153,17 +153,12 @@ 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_;
|
| -
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
|
| };
|
|
|