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

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

Issue 2172423002: Simplify WebrtcDataStreamAdapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
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 10
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 bool negotiation_pending_ = false; 142 bool negotiation_pending_ = false;
143 143
144 bool connected_ = false; 144 bool connected_ = false;
145 145
146 std::unique_ptr<buzz::XmlElement> pending_transport_info_message_; 146 std::unique_ptr<buzz::XmlElement> pending_transport_info_message_;
147 base::OneShotTimer transport_info_timer_; 147 base::OneShotTimer transport_info_timer_;
148 148
149 ScopedVector<webrtc::IceCandidateInterface> pending_incoming_candidates_; 149 ScopedVector<webrtc::IceCandidateInterface> pending_incoming_candidates_;
150 150
151 std::unique_ptr<WebrtcDataStreamAdapter> data_stream_adapter_;
152
153 base::WeakPtrFactory<WebrtcTransport> weak_factory_; 151 base::WeakPtrFactory<WebrtcTransport> weak_factory_;
154 152
155 DISALLOW_COPY_AND_ASSIGN(WebrtcTransport); 153 DISALLOW_COPY_AND_ASSIGN(WebrtcTransport);
156 }; 154 };
157 155
158 } // namespace protocol 156 } // namespace protocol
159 } // namespace remoting 157 } // namespace remoting
160 158
161 #endif // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ 159 #endif // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698