| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_WEBRTC_TRANSPORT_H_ | 5 #ifndef REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ |
| 6 #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ | 6 #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> |
| 10 | 11 |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
| 13 #include "base/memory/scoped_vector.h" | |
| 14 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
| 15 #include "base/threading/thread_checker.h" | 15 #include "base/threading/thread_checker.h" |
| 16 #include "base/timer/timer.h" | 16 #include "base/timer/timer.h" |
| 17 #include "crypto/hmac.h" | 17 #include "crypto/hmac.h" |
| 18 #include "remoting/protocol/transport.h" | 18 #include "remoting/protocol/transport.h" |
| 19 #include "remoting/protocol/webrtc_data_stream_adapter.h" | 19 #include "remoting/protocol/webrtc_data_stream_adapter.h" |
| 20 #include "remoting/protocol/webrtc_dummy_video_encoder.h" | 20 #include "remoting/protocol/webrtc_dummy_video_encoder.h" |
| 21 #include "remoting/signaling/signal_strategy.h" | 21 #include "remoting/signaling/signal_strategy.h" |
| 22 #include "third_party/webrtc/api/peerconnectioninterface.h" | 22 #include "third_party/webrtc/api/peerconnectioninterface.h" |
| 23 | 23 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 134 |
| 135 WebrtcDummyVideoEncoderFactory* video_encoder_factory_; | 135 WebrtcDummyVideoEncoderFactory* video_encoder_factory_; |
| 136 | 136 |
| 137 bool negotiation_pending_ = false; | 137 bool negotiation_pending_ = false; |
| 138 | 138 |
| 139 bool connected_ = false; | 139 bool connected_ = false; |
| 140 | 140 |
| 141 std::unique_ptr<buzz::XmlElement> pending_transport_info_message_; | 141 std::unique_ptr<buzz::XmlElement> pending_transport_info_message_; |
| 142 base::OneShotTimer transport_info_timer_; | 142 base::OneShotTimer transport_info_timer_; |
| 143 | 143 |
| 144 ScopedVector<webrtc::IceCandidateInterface> pending_incoming_candidates_; | 144 std::vector<std::unique_ptr<webrtc::IceCandidateInterface>> |
| 145 pending_incoming_candidates_; |
| 145 | 146 |
| 146 base::WeakPtrFactory<WebrtcTransport> weak_factory_; | 147 base::WeakPtrFactory<WebrtcTransport> weak_factory_; |
| 147 | 148 |
| 148 DISALLOW_COPY_AND_ASSIGN(WebrtcTransport); | 149 DISALLOW_COPY_AND_ASSIGN(WebrtcTransport); |
| 149 }; | 150 }; |
| 150 | 151 |
| 151 } // namespace protocol | 152 } // namespace protocol |
| 152 } // namespace remoting | 153 } // namespace remoting |
| 153 | 154 |
| 154 #endif // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ | 155 #endif // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ |
| OLD | NEW |