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

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

Issue 2694103003: Un-break downstream project. (Closed)
Patch Set: Clearify the comment. Created 3 years, 10 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 | webrtc/p2p/base/port.cc » ('j') | 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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 316
317 int16_t network_cost() const { return network_cost_; } 317 int16_t network_cost() const { return network_cost_; }
318 318
319 protected: 319 protected:
320 enum { MSG_DESTROY_IF_DEAD = 0, MSG_FIRST_AVAILABLE }; 320 enum { MSG_DESTROY_IF_DEAD = 0, MSG_FIRST_AVAILABLE };
321 321
322 virtual void UpdateNetworkCost(); 322 virtual void UpdateNetworkCost();
323 323
324 void set_type(const std::string& type) { type_ = type; } 324 void set_type(const std::string& type) { type_ = type; }
325 325
326 // Deprecated. Use the AddAddress() method below with "url" instead.
327 // TODO(zhihuang): Remove this after downstream applications stop using it.
328 void AddAddress(const rtc::SocketAddress& address,
329 const rtc::SocketAddress& base_address,
330 const rtc::SocketAddress& related_address,
331 const std::string& protocol,
332 const std::string& relay_protocol,
333 const std::string& tcptype,
334 const std::string& type,
335 uint32_t type_preference,
336 uint32_t relay_preference,
337 bool final);
338
326 void AddAddress(const rtc::SocketAddress& address, 339 void AddAddress(const rtc::SocketAddress& address,
327 const rtc::SocketAddress& base_address, 340 const rtc::SocketAddress& base_address,
328 const rtc::SocketAddress& related_address, 341 const rtc::SocketAddress& related_address,
329 const std::string& protocol, 342 const std::string& protocol,
330 const std::string& relay_protocol, 343 const std::string& relay_protocol,
331 const std::string& tcptype, 344 const std::string& tcptype,
332 const std::string& type, 345 const std::string& type,
333 uint32_t type_preference, 346 uint32_t type_preference,
334 uint32_t relay_preference, 347 uint32_t relay_preference,
335 const std::string& url, 348 const std::string& url,
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 const rtc::PacketOptions& options) override; 728 const rtc::PacketOptions& options) override;
716 int GetError() override { return error_; } 729 int GetError() override { return error_; }
717 730
718 private: 731 private:
719 int error_ = 0; 732 int error_ = 0;
720 }; 733 };
721 734
722 } // namespace cricket 735 } // namespace cricket
723 736
724 #endif // WEBRTC_P2P_BASE_PORT_H_ 737 #endif // WEBRTC_P2P_BASE_PORT_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/p2p/base/port.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698