| Index: remoting/protocol/session.h
|
| diff --git a/remoting/protocol/session.h b/remoting/protocol/session.h
|
| index fc40a6d6de83502da2e0e10e2700f8e914e3c287..088bbb23551c62d3842c4f150c3bd7bfededf947 100644
|
| --- a/remoting/protocol/session.h
|
| +++ b/remoting/protocol/session.h
|
| @@ -28,10 +28,24 @@ namespace protocol {
|
| class Session : public base::NonThreadSafe {
|
| public:
|
| enum State {
|
| + // Created, but not connecting yet.
|
| INITIALIZING,
|
| +
|
| + // Sent or received session-initiate, but haven't sent or received
|
| + // session-accept.
|
| CONNECTING,
|
| +
|
| + // Session has been accepted, but channels are connected yet.
|
| CONNECTED,
|
| +
|
| + // Video and control channels are connected.
|
| + // TODO(sergeyu): Remove this state.
|
| + CONNECTED_CHANNELS,
|
| +
|
| + // Session has been closed.
|
| CLOSED,
|
| +
|
| + // Connection has failed.
|
| FAILED,
|
| };
|
|
|
| @@ -64,9 +78,6 @@ class Session : public base::NonThreadSafe {
|
| // instead.
|
| virtual net::Socket* control_channel() = 0;
|
| virtual net::Socket* event_channel() = 0;
|
| - virtual net::Socket* video_channel() = 0;
|
| - virtual net::Socket* video_rtp_channel() = 0;
|
| - virtual net::Socket* video_rtcp_channel() = 0;
|
|
|
| // JID of the other side.
|
| virtual const std::string& jid() = 0;
|
|
|