Chromium Code Reviews| Index: webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm |
| diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm |
| index 57c678032a19be0c489a9fad4a00895f9efdbd25..5920568d3de157c99a5f11470ff3b688cd526778 100644 |
| --- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm |
| +++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm |
| @@ -198,9 +198,9 @@ void PeerConnectionDelegateAdapter::OnIceCandidate( |
| delegate:(id<RTCPeerConnectionDelegate>)delegate { |
| NSParameterAssert(factory); |
| std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config( |
| - configuration.nativeConfiguration); |
| + configuration.createNativeConfiguration); |
|
tkchin_webrtc
2016/05/16 21:01:32
not a property, so use [configuration createNative
hbos
2016/05/17 09:05:03
Done. *Pretending to know objective-c++ when I don
|
| if (!config) |
|
tkchin_webrtc
2016/05/16 21:01:32
braces
if (!config) {
return nil;
}
hbos
2016/05/17 09:05:03
Done. (I think you asked me in the other CL and I
|
| - return nullptr; |
| + return nil; |
| if (self = [super init]) { |
| _observer.reset(new webrtc::PeerConnectionDelegateAdapter(self)); |
| std::unique_ptr<webrtc::MediaConstraints> nativeConstraints = |
| @@ -254,9 +254,9 @@ void PeerConnectionDelegateAdapter::OnIceCandidate( |
| - (BOOL)setConfiguration:(RTCConfiguration *)configuration { |
| std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config( |
| - configuration.nativeConfiguration); |
| + configuration.createNativeConfiguration); |
|
tkchin_webrtc
2016/05/16 21:01:32
ditto [] and {}
hbos
2016/05/17 09:05:03
Done.
|
| if (!config) |
| - return false; |
| + return NO; |
| return _peerConnection->SetConfiguration(*config); |
| } |