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

Side by Side Diff: webrtc/p2p/base/p2ptransportchannel.h

Issue 2110853005: Add back P2PTransportChannel.Connect, for Chromium. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add back P2PTransportChannel.Connect, for Chromium. 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // From TransportChannelImpl: 86 // From TransportChannelImpl:
87 TransportChannelState GetState() const override; 87 TransportChannelState GetState() const override;
88 void SetIceRole(IceRole role) override; 88 void SetIceRole(IceRole role) override;
89 IceRole GetIceRole() const override { return ice_role_; } 89 IceRole GetIceRole() const override { return ice_role_; }
90 void SetIceTiebreaker(uint64_t tiebreaker) override; 90 void SetIceTiebreaker(uint64_t tiebreaker) override;
91 void SetIceCredentials(const std::string& ice_ufrag, 91 void SetIceCredentials(const std::string& ice_ufrag,
92 const std::string& ice_pwd) override; 92 const std::string& ice_pwd) override;
93 void SetRemoteIceCredentials(const std::string& ice_ufrag, 93 void SetRemoteIceCredentials(const std::string& ice_ufrag,
94 const std::string& ice_pwd) override; 94 const std::string& ice_pwd) override;
95 void SetRemoteIceMode(IceMode mode) override; 95 void SetRemoteIceMode(IceMode mode) override;
96 // TODO(deadbeef): Deprecated. Remove when Chromium's
97 // IceTransportChannel does not depend on this.
98 void Connect() {}
96 void MaybeStartGathering() override; 99 void MaybeStartGathering() override;
97 IceGatheringState gathering_state() const override { 100 IceGatheringState gathering_state() const override {
98 return gathering_state_; 101 return gathering_state_;
99 } 102 }
100 void AddRemoteCandidate(const Candidate& candidate) override; 103 void AddRemoteCandidate(const Candidate& candidate) override;
101 void RemoveRemoteCandidate(const Candidate& candidate) override; 104 void RemoveRemoteCandidate(const Candidate& candidate) override;
102 // Sets the parameters in IceConfig. We do not set them blindly. Instead, we 105 // Sets the parameters in IceConfig. We do not set them blindly. Instead, we
103 // only update the parameter if it is considered set in |config|. For example, 106 // only update the parameter if it is considered set in |config|. For example,
104 // a negative value of receiving_timeout will be considered "not set" and we 107 // a negative value of receiving_timeout will be considered "not set" and we
105 // will not use it to update the respective parameter in |config_|. 108 // will not use it to update the respective parameter in |config_|.
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 IceConfig config_; 374 IceConfig config_;
372 int last_sent_packet_id_ = -1; // -1 indicates no packet was sent before. 375 int last_sent_packet_id_ = -1; // -1 indicates no packet was sent before.
373 bool started_pinging_ = false; 376 bool started_pinging_ = false;
374 377
375 RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel); 378 RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel);
376 }; 379 };
377 380
378 } // namespace cricket 381 } // namespace cricket
379 382
380 #endif // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_ 383 #endif // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698