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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_SESSION_H_ 5 #ifndef REMOTING_PROTOCOL_SESSION_H_
6 #define REMOTING_PROTOCOL_SESSION_H_ 6 #define REMOTING_PROTOCOL_SESSION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // CONNECTED state. 57 // CONNECTED state.
58 virtual void CreateStreamChannel( 58 virtual void CreateStreamChannel(
59 const std::string& name, const StreamChannelCallback& callback) = 0; 59 const std::string& name, const StreamChannelCallback& callback) = 0;
60 virtual void CreateDatagramChannel( 60 virtual void CreateDatagramChannel(
61 const std::string& name, const DatagramChannelCallback& callback) = 0; 61 const std::string& name, const DatagramChannelCallback& callback) = 0;
62 62
63 // TODO(sergeyu): Remove these methods, and use CreateChannel() 63 // TODO(sergeyu): Remove these methods, and use CreateChannel()
64 // instead. 64 // instead.
65 virtual net::Socket* control_channel() = 0; 65 virtual net::Socket* control_channel() = 0;
66 virtual net::Socket* event_channel() = 0; 66 virtual net::Socket* event_channel() = 0;
67 virtual net::Socket* video_channel() = 0;
68 virtual net::Socket* video_rtp_channel() = 0;
69 virtual net::Socket* video_rtcp_channel() = 0;
70 67
71 // JID of the other side. 68 // JID of the other side.
72 virtual const std::string& jid() = 0; 69 virtual const std::string& jid() = 0;
73 70
74 // Configuration of the protocol that was sent or received in the 71 // Configuration of the protocol that was sent or received in the
75 // session-initiate jingle message. Returned pointer is valid until 72 // session-initiate jingle message. Returned pointer is valid until
76 // connection is closed. 73 // connection is closed.
77 virtual const CandidateSessionConfig* candidate_config() = 0; 74 virtual const CandidateSessionConfig* candidate_config() = 0;
78 75
79 // Protocol configuration. Can be called only after session has been accepted. 76 // Protocol configuration. Can be called only after session has been accepted.
(...skipping 22 matching lines...) Expand all
102 virtual void Close() = 0; 99 virtual void Close() = 0;
103 100
104 private: 101 private:
105 DISALLOW_COPY_AND_ASSIGN(Session); 102 DISALLOW_COPY_AND_ASSIGN(Session);
106 }; 103 };
107 104
108 } // namespace protocol 105 } // namespace protocol
109 } // namespace remoting 106 } // namespace remoting
110 107
111 #endif // REMOTING_PROTOCOL_SESSION_H_ 108 #endif // REMOTING_PROTOCOL_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698