OLD | NEW |
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 Loading... |
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_ |
OLD | NEW |