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

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

Issue 1361273002: Reland of Adding PeerConnectionInterface::SetConfiguration method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing patch conflict. Created 5 years, 2 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 | « talk/app/webrtc/peerconnectioninterface.h ('k') | no next file » | 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 * 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, local_description) 55 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, local_description)
56 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, remote_description) 56 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, remote_description)
57 PROXY_METHOD2(void, CreateOffer, CreateSessionDescriptionObserver*, 57 PROXY_METHOD2(void, CreateOffer, CreateSessionDescriptionObserver*,
58 const MediaConstraintsInterface*) 58 const MediaConstraintsInterface*)
59 PROXY_METHOD2(void, CreateAnswer, CreateSessionDescriptionObserver*, 59 PROXY_METHOD2(void, CreateAnswer, CreateSessionDescriptionObserver*,
60 const MediaConstraintsInterface*) 60 const MediaConstraintsInterface*)
61 PROXY_METHOD2(void, SetLocalDescription, SetSessionDescriptionObserver*, 61 PROXY_METHOD2(void, SetLocalDescription, SetSessionDescriptionObserver*,
62 SessionDescriptionInterface*) 62 SessionDescriptionInterface*)
63 PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*, 63 PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*,
64 SessionDescriptionInterface*) 64 SessionDescriptionInterface*)
65 PROXY_METHOD2(bool, UpdateIce, const IceServers&, 65 PROXY_METHOD1(bool,
66 const MediaConstraintsInterface*) 66 SetConfiguration,
67 const PeerConnectionInterface::RTCConfiguration&);
67 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*) 68 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
68 PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*) 69 PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)
69 PROXY_METHOD0(SignalingState, signaling_state) 70 PROXY_METHOD0(SignalingState, signaling_state)
70 PROXY_METHOD0(IceState, ice_state) 71 PROXY_METHOD0(IceState, ice_state)
71 PROXY_METHOD0(IceConnectionState, ice_connection_state) 72 PROXY_METHOD0(IceConnectionState, ice_connection_state)
72 PROXY_METHOD0(IceGatheringState, ice_gathering_state) 73 PROXY_METHOD0(IceGatheringState, ice_gathering_state)
73 PROXY_METHOD0(void, Close) 74 PROXY_METHOD0(void, Close)
74 END_PROXY() 75 END_PROXY()
75 76
76 } // namespace webrtc 77 } // namespace webrtc
77 78
78 #endif // TALK_APP_WEBRTC_PEERCONNECTIONPROXY_H_ 79 #endif // TALK_APP_WEBRTC_PEERCONNECTIONPROXY_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectioninterface.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698