| 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_PEPPER_SESSION_H_ | 5 #ifndef REMOTING_PROTOCOL_PEPPER_SESSION_H_ |
| 6 #define REMOTING_PROTOCOL_PEPPER_SESSION_H_ | 6 #define REMOTING_PROTOCOL_PEPPER_SESSION_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 scoped_ptr<Authenticator> authenticator_; | 140 scoped_ptr<Authenticator> authenticator_; |
| 141 | 141 |
| 142 // Container for pending Iq requests. Requests are removed in | 142 // Container for pending Iq requests. Requests are removed in |
| 143 // CleanupPendingRequests() which is called when a response is | 143 // CleanupPendingRequests() which is called when a response is |
| 144 // received or one of the requests times out. | 144 // received or one of the requests times out. |
| 145 std::list<IqRequest*> pending_requests_; | 145 std::list<IqRequest*> pending_requests_; |
| 146 | 146 |
| 147 ChannelsMap channels_; | 147 ChannelsMap channels_; |
| 148 | 148 |
| 149 base::OneShotTimer<JingleSession> transport_infos_timer_; | 149 base::OneShotTimer<JingleSession> transport_infos_timer_; |
| 150 std::list<cricket::Candidate> pending_candidates_; | 150 std::list<JingleMessage::NamedCandidate> pending_candidates_; |
| 151 | 151 |
| 152 DISALLOW_COPY_AND_ASSIGN(JingleSession); | 152 DISALLOW_COPY_AND_ASSIGN(JingleSession); |
| 153 }; | 153 }; |
| 154 | 154 |
| 155 } // namespace protocol | 155 } // namespace protocol |
| 156 } // namespace remoting | 156 } // namespace remoting |
| 157 | 157 |
| 158 #endif // REMOTING_PROTOCOL_PEPPER_SESSION_H_ | 158 #endif // REMOTING_PROTOCOL_PEPPER_SESSION_H_ |
| OLD | NEW |