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

Side by Side Diff: talk/app/webrtc/jsepicecandidate.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 15 matching lines...) Expand all
26 */ 26 */
27 27
28 // Implements the IceCandidateInterface. 28 // Implements the IceCandidateInterface.
29 29
30 #ifndef TALK_APP_WEBRTC_JSEPICECANDIDATE_H_ 30 #ifndef TALK_APP_WEBRTC_JSEPICECANDIDATE_H_
31 #define TALK_APP_WEBRTC_JSEPICECANDIDATE_H_ 31 #define TALK_APP_WEBRTC_JSEPICECANDIDATE_H_
32 32
33 #include <string> 33 #include <string>
34 34
35 #include "talk/app/webrtc/jsep.h" 35 #include "talk/app/webrtc/jsep.h"
36 #include "webrtc/base/constructormagic.h"
36 #include "webrtc/p2p/base/candidate.h" 37 #include "webrtc/p2p/base/candidate.h"
37 #include "webrtc/base/constructormagic.h"
38 38
39 namespace webrtc { 39 namespace webrtc {
40 40
41 class JsepIceCandidate : public IceCandidateInterface { 41 class JsepIceCandidate : public IceCandidateInterface {
42 public: 42 public:
43 JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index); 43 JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index);
44 JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index, 44 JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index,
45 const cricket::Candidate& candidate); 45 const cricket::Candidate& candidate);
46 ~JsepIceCandidate(); 46 ~JsepIceCandidate();
47 // |error| can be NULL if don't care about the failure reason. 47 // |error| can be NULL if don't care about the failure reason.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 return candidates_[index]; 83 return candidates_[index];
84 } 84 }
85 85
86 private: 86 private:
87 std::vector<JsepIceCandidate*> candidates_; 87 std::vector<JsepIceCandidate*> candidates_;
88 }; 88 };
89 89
90 } // namespace webrtc 90 } // namespace webrtc
91 91
92 #endif // TALK_APP_WEBRTC_JSEPICECANDIDATE_H_ 92 #endif // TALK_APP_WEBRTC_JSEPICECANDIDATE_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/peerconnection_jni.cc ('k') | talk/app/webrtc/jsepsessiondescription_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698