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

Side by Side Diff: remoting/protocol/jingle_session_manager.h

Issue 7616017: Remove key exchange code from JingleSession. (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
« no previous file with comments | « remoting/protocol/jingle_session.cc ('k') | remoting/protocol/jingle_session_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_MANAGER_H_ 5 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
6 #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 6 #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 // Callback for JingleInfoRequest. 97 // Callback for JingleInfoRequest.
98 void OnJingleInfo( 98 void OnJingleInfo(
99 const std::string& token, 99 const std::string& token,
100 const std::vector<std::string>& relay_hosts, 100 const std::vector<std::string>& relay_hosts,
101 const std::vector<talk_base::SocketAddress>& stun_hosts); 101 const std::vector<talk_base::SocketAddress>& stun_hosts);
102 102
103 // Creates session description for outgoing session. 103 // Creates session description for outgoing session.
104 static cricket::SessionDescription* CreateClientSessionDescription( 104 static cricket::SessionDescription* CreateClientSessionDescription(
105 const CandidateSessionConfig* candidate_config, 105 const CandidateSessionConfig* candidate_config,
106 const std::string& auth_token, 106 const std::string& auth_token);
107 const std::string& master_key);
108 // Creates session description for incoming session. 107 // Creates session description for incoming session.
109 static cricket::SessionDescription* CreateHostSessionDescription( 108 static cricket::SessionDescription* CreateHostSessionDescription(
110 const CandidateSessionConfig* candidate_config, 109 const CandidateSessionConfig* candidate_config,
111 const std::string& certificate); 110 const std::string& certificate);
112 111
113 scoped_ptr<talk_base::NetworkManager> network_manager_; 112 scoped_ptr<talk_base::NetworkManager> network_manager_;
114 scoped_ptr<talk_base::PacketSocketFactory> socket_factory_; 113 scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
115 scoped_ptr<HostResolverFactory> host_resolver_factory_; 114 scoped_ptr<HostResolverFactory> host_resolver_factory_;
116 scoped_ptr<PortAllocatorSessionFactory> port_allocator_session_factory_; 115 scoped_ptr<PortAllocatorSessionFactory> port_allocator_session_factory_;
117 116
(...skipping 18 matching lines...) Expand all
136 135
137 ScopedRunnableMethodFactory<JingleSessionManager> task_factory_; 136 ScopedRunnableMethodFactory<JingleSessionManager> task_factory_;
138 137
139 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager); 138 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
140 }; 139 };
141 140
142 } // namespace protocol 141 } // namespace protocol
143 } // namespace remoting 142 } // namespace remoting
144 143
145 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 144 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session.cc ('k') | remoting/protocol/jingle_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698