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

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

Issue 18295009: Allow transport candidates to arrive after the authentication accepted message. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | « no previous file | remoting/protocol/jingle_session.cc » ('j') | remoting/protocol/jingle_session.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // Pending transport-info requests. 160 // Pending transport-info requests.
161 std::list<IqRequest*> transport_info_requests_; 161 std::list<IqRequest*> transport_info_requests_;
162 162
163 ChannelsMap channels_; 163 ChannelsMap channels_;
164 scoped_ptr<ChannelMultiplexer> channel_multiplexer_; 164 scoped_ptr<ChannelMultiplexer> channel_multiplexer_;
165 165
166 base::OneShotTimer<JingleSession> transport_infos_timer_; 166 base::OneShotTimer<JingleSession> transport_infos_timer_;
167 std::list<JingleMessage::NamedCandidate> pending_candidates_; 167 std::list<JingleMessage::NamedCandidate> pending_candidates_;
168 168
169 // Pending remote candidates, received before the local channels were created.
170 std::list<JingleMessage::NamedCandidate> pending_remote_candidates_;
171
169 DISALLOW_COPY_AND_ASSIGN(JingleSession); 172 DISALLOW_COPY_AND_ASSIGN(JingleSession);
170 }; 173 };
171 174
172 } // namespace protocol 175 } // namespace protocol
173 } // namespace remoting 176 } // namespace remoting
174 177
175 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_ 178 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/jingle_session.cc » ('j') | remoting/protocol/jingle_session.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698