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

Side by Side Diff: remoting/protocol/jingle_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_JINGLE_SESSION_H_ 5 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_H_
6 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_ 6 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/task.h" 9 #include "base/task.h"
10 #include "crypto/rsa_private_key.h" 10 #include "crypto/rsa_private_key.h"
(...skipping 20 matching lines...) Expand all
31 // Session interface. 31 // Session interface.
32 virtual void SetStateChangeCallback(StateChangeCallback* callback) OVERRIDE; 32 virtual void SetStateChangeCallback(StateChangeCallback* callback) OVERRIDE;
33 virtual void CreateStreamChannel( 33 virtual void CreateStreamChannel(
34 const std::string& name, 34 const std::string& name,
35 const StreamChannelCallback& callback) OVERRIDE; 35 const StreamChannelCallback& callback) OVERRIDE;
36 virtual void CreateDatagramChannel( 36 virtual void CreateDatagramChannel(
37 const std::string& name, 37 const std::string& name,
38 const DatagramChannelCallback& callback) OVERRIDE; 38 const DatagramChannelCallback& callback) OVERRIDE;
39 virtual net::Socket* control_channel() OVERRIDE; 39 virtual net::Socket* control_channel() OVERRIDE;
40 virtual net::Socket* event_channel() OVERRIDE; 40 virtual net::Socket* event_channel() OVERRIDE;
41 virtual net::Socket* video_channel() OVERRIDE;
42 virtual net::Socket* video_rtp_channel() OVERRIDE;
43 virtual net::Socket* video_rtcp_channel() OVERRIDE;
44 virtual const std::string& jid() OVERRIDE; 41 virtual const std::string& jid() OVERRIDE;
45 virtual const CandidateSessionConfig* candidate_config() OVERRIDE; 42 virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
46 virtual const SessionConfig* config() OVERRIDE; 43 virtual const SessionConfig* config() OVERRIDE;
47 virtual void set_config(const SessionConfig* config) OVERRIDE; 44 virtual void set_config(const SessionConfig* config) OVERRIDE;
48 virtual const std::string& initiator_token() OVERRIDE; 45 virtual const std::string& initiator_token() OVERRIDE;
49 virtual void set_initiator_token(const std::string& initiator_token) OVERRIDE; 46 virtual void set_initiator_token(const std::string& initiator_token) OVERRIDE;
50 virtual const std::string& receiver_token() OVERRIDE; 47 virtual const std::string& receiver_token() OVERRIDE;
51 virtual void set_receiver_token(const std::string& receiver_token) OVERRIDE; 48 virtual void set_receiver_token(const std::string& receiver_token) OVERRIDE;
52 virtual void set_shared_secret(const std::string& secret) OVERRIDE; 49 virtual void set_shared_secret(const std::string& secret) OVERRIDE;
53 virtual const std::string& shared_secret() OVERRIDE; 50 virtual const std::string& shared_secret() OVERRIDE;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 std::string receiver_token_; 175 std::string receiver_token_;
179 176
180 // These data members are only set on the receiving side. 177 // These data members are only set on the receiving side.
181 scoped_ptr<const CandidateSessionConfig> candidate_config_; 178 scoped_ptr<const CandidateSessionConfig> candidate_config_;
182 179
183 // Channels that are currently being connected. 180 // Channels that are currently being connected.
184 std::map<std::string, JingleChannelConnector*> channel_connectors_; 181 std::map<std::string, JingleChannelConnector*> channel_connectors_;
185 182
186 scoped_ptr<net::Socket> control_channel_socket_; 183 scoped_ptr<net::Socket> control_channel_socket_;
187 scoped_ptr<net::Socket> event_channel_socket_; 184 scoped_ptr<net::Socket> event_channel_socket_;
188 scoped_ptr<net::Socket> video_channel_socket_;
189 185
190 ScopedRunnableMethodFactory<JingleSession> task_factory_; 186 ScopedRunnableMethodFactory<JingleSession> task_factory_;
191 187
192 DISALLOW_COPY_AND_ASSIGN(JingleSession); 188 DISALLOW_COPY_AND_ASSIGN(JingleSession);
193 }; 189 };
194 190
195 } // namespace protocol 191 } // namespace protocol
196 192
197 } // namespace remoting 193 } // namespace remoting
198 194
199 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_ 195 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698