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

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: Removing leftover comments Created 4 years 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 * 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 const RTCOfferAnswerOptions&) 57 const RTCOfferAnswerOptions&)
58 PROXY_METHOD2(void, 58 PROXY_METHOD2(void,
59 CreateAnswer, 59 CreateAnswer,
60 CreateSessionDescriptionObserver*, 60 CreateSessionDescriptionObserver*,
61 const RTCOfferAnswerOptions&) 61 const RTCOfferAnswerOptions&)
62 PROXY_METHOD2(void, SetLocalDescription, SetSessionDescriptionObserver*, 62 PROXY_METHOD2(void, SetLocalDescription, SetSessionDescriptionObserver*,
63 SessionDescriptionInterface*) 63 SessionDescriptionInterface*)
64 PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*, 64 PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*,
65 SessionDescriptionInterface*) 65 SessionDescriptionInterface*)
66 PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration); 66 PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration);
67 PROXY_METHOD1(bool, 67 PROXY_METHOD2(bool,
68 SetConfiguration, 68 SetConfiguration,
69 const PeerConnectionInterface::RTCConfiguration&); 69 const PeerConnectionInterface::RTCConfiguration&,
70 RtcError*);
70 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*) 71 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
71 PROXY_METHOD1(bool, 72 PROXY_METHOD1(bool,
72 RemoveIceCandidates, 73 RemoveIceCandidates,
73 const std::vector<cricket::Candidate>&); 74 const std::vector<cricket::Candidate>&);
74 PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*) 75 PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)
75 PROXY_METHOD0(SignalingState, signaling_state) 76 PROXY_METHOD0(SignalingState, signaling_state)
76 PROXY_METHOD0(IceConnectionState, ice_connection_state) 77 PROXY_METHOD0(IceConnectionState, ice_connection_state)
77 PROXY_METHOD0(IceGatheringState, ice_gathering_state) 78 PROXY_METHOD0(IceGatheringState, ice_gathering_state)
78 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t) 79 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)
79 PROXY_METHOD0(void, StopRtcEventLog) 80 PROXY_METHOD0(void, StopRtcEventLog)
80 PROXY_METHOD0(void, Close) 81 PROXY_METHOD0(void, Close)
81 END_SIGNALING_PROXY() 82 END_SIGNALING_PROXY()
82 83
83 } // namespace webrtc 84 } // namespace webrtc
84 85
85 #endif // WEBRTC_API_PEERCONNECTIONPROXY_H_ 86 #endif // WEBRTC_API_PEERCONNECTIONPROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698