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

Side by Side Diff: webrtc/api/peerconnectionproxy.h

Issue 2587133004: Reland of: Adding error output param to SetConfiguration, using new RTCError type. (Closed)
Patch Set: Fixing compile error in less confusing way. Created 3 years, 11 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 | « webrtc/api/peerconnectioninterface_unittest.cc ('k') | webrtc/media/base/mediachannel.h » ('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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 const RTCOfferAnswerOptions&) 65 const RTCOfferAnswerOptions&)
66 PROXY_METHOD2(void, 66 PROXY_METHOD2(void,
67 CreateAnswer, 67 CreateAnswer,
68 CreateSessionDescriptionObserver*, 68 CreateSessionDescriptionObserver*,
69 const RTCOfferAnswerOptions&) 69 const RTCOfferAnswerOptions&)
70 PROXY_METHOD2(void, SetLocalDescription, SetSessionDescriptionObserver*, 70 PROXY_METHOD2(void, SetLocalDescription, SetSessionDescriptionObserver*,
71 SessionDescriptionInterface*) 71 SessionDescriptionInterface*)
72 PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*, 72 PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*,
73 SessionDescriptionInterface*) 73 SessionDescriptionInterface*)
74 PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration); 74 PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration);
75 PROXY_METHOD2(bool,
76 SetConfiguration,
77 const PeerConnectionInterface::RTCConfiguration&,
78 RTCError*);
75 PROXY_METHOD1(bool, 79 PROXY_METHOD1(bool,
76 SetConfiguration, 80 SetConfiguration,
77 const PeerConnectionInterface::RTCConfiguration&); 81 const PeerConnectionInterface::RTCConfiguration&);
78 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*) 82 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
79 PROXY_METHOD1(bool, 83 PROXY_METHOD1(bool,
80 RemoveIceCandidates, 84 RemoveIceCandidates,
81 const std::vector<cricket::Candidate>&); 85 const std::vector<cricket::Candidate>&);
82 PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*) 86 PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)
83 PROXY_METHOD0(SignalingState, signaling_state) 87 PROXY_METHOD0(SignalingState, signaling_state)
84 PROXY_METHOD0(IceConnectionState, ice_connection_state) 88 PROXY_METHOD0(IceConnectionState, ice_connection_state)
85 PROXY_METHOD0(IceGatheringState, ice_gathering_state) 89 PROXY_METHOD0(IceGatheringState, ice_gathering_state)
86 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t) 90 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)
87 PROXY_METHOD0(void, StopRtcEventLog) 91 PROXY_METHOD0(void, StopRtcEventLog)
88 PROXY_METHOD0(void, Close) 92 PROXY_METHOD0(void, Close)
89 END_SIGNALING_PROXY() 93 END_SIGNALING_PROXY()
90 94
91 } // namespace webrtc 95 } // namespace webrtc
92 96
93 #endif // WEBRTC_API_PEERCONNECTIONPROXY_H_ 97 #endif // WEBRTC_API_PEERCONNECTIONPROXY_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectioninterface_unittest.cc ('k') | webrtc/media/base/mediachannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698