Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Unified Diff: remoting/protocol/session.h

Issue 7508044: Remove video_channel() from Session interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/rtp_video_writer_unittest.cc ('k') | remoting/protocol/video_reader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « remoting/protocol/rtp_video_writer_unittest.cc ('k') | remoting/protocol/video_reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698