talk/app/webrtc/peerconnectionproxy.h - Issue 1361263002: Revert of Adding PeerConnectionInterface::SetConfiguration method.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1361263002: Revert of Adding PeerConnectionInterface::SetConfiguration method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: 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 »

OLD	NEW
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 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 PROXY_METHOD2(void, CreateOffer, CreateSessionDescriptionObserver*,	53 PROXY_METHOD2(void, CreateOffer, CreateSessionDescriptionObserver*,

54 const MediaConstraintsInterface*)	54 const MediaConstraintsInterface*)

55 PROXY_METHOD2(void, CreateAnswer, CreateSessionDescriptionObserver*,	55 PROXY_METHOD2(void, CreateAnswer, CreateSessionDescriptionObserver*,

56 const MediaConstraintsInterface*)	56 const MediaConstraintsInterface*)

57 PROXY_METHOD2(void, SetLocalDescription, SetSessionDescriptionObserver*,	57 PROXY_METHOD2(void, SetLocalDescription, SetSessionDescriptionObserver*,

58 SessionDescriptionInterface*)	58 SessionDescriptionInterface*)

59 PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*,	59 PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*,

60 SessionDescriptionInterface*)	60 SessionDescriptionInterface*)

61 PROXY_METHOD2(bool, UpdateIce, const IceServers&,	61 PROXY_METHOD2(bool, UpdateIce, const IceServers&,

62 const MediaConstraintsInterface*)	62 const MediaConstraintsInterface*)

63 PROXY_METHOD1(bool,

64 SetConfiguration,

65 const PeerConnectionInterface::RTCConfiguration&);

66 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)	63 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)

67 PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)	64 PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)

68 PROXY_METHOD0(SignalingState, signaling_state)	65 PROXY_METHOD0(SignalingState, signaling_state)

69 PROXY_METHOD0(IceState, ice_state)	66 PROXY_METHOD0(IceState, ice_state)

70 PROXY_METHOD0(IceConnectionState, ice_connection_state)	67 PROXY_METHOD0(IceConnectionState, ice_connection_state)

71 PROXY_METHOD0(IceGatheringState, ice_gathering_state)	68 PROXY_METHOD0(IceGatheringState, ice_gathering_state)

72 PROXY_METHOD0(void, Close)	69 PROXY_METHOD0(void, Close)

73 END_PROXY()	70 END_PROXY()

74	71

75 } // namespace webrtc	72 } // namespace webrtc

76	73

77 #endif // TALK_APP_WEBRTC_PEERCONNECTIONPROXY_H_	74 #endif // TALK_APP_WEBRTC_PEERCONNECTIONPROXY_H_

OLD	NEW