diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-11-12 17:59:58 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-11-12 17:59:58 +0000 |
| commit | 2eed1ff3f44fb784dbe3aece06ec6e4781e177f1 (patch) | |
| tree | 3c7d78d81b4c69cae88708e072ba9eee0bec0257 /app/webrtc/peerconnectionproxy.h | |
| parent | ce708afc0470244d9ec2e52b28564c62a0f6cd01 (diff) | |
| parent | c8429e63ec07341d0055a8f31f66a995d62f8555 (diff) | |
| download | talk-c9d346e2680ff0f33a1c7cc089e6342f4ca180bf.tar.gz | |
Merge from Chromium at DEPS revision 03655fd3f6d7HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-m-preview-2android-m-preview-1android-m-previewub-webview-m40-releasemaster-soongmastermain
This commit was generated by merge_to_master.py.
Change-Id: Ie97de41dee6631b70dd07c00db5bf3ad4dfe8e14
Diffstat (limited to 'app/webrtc/peerconnectionproxy.h')
| -rw-r--r-- | app/webrtc/peerconnectionproxy.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/webrtc/peerconnectionproxy.h b/app/webrtc/peerconnectionproxy.h index 571c676..852d852 100644 --- a/app/webrtc/peerconnectionproxy.h +++ b/app/webrtc/peerconnectionproxy.h @@ -40,8 +40,6 @@ BEGIN_PROXY_MAP(PeerConnection) PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>, remote_streams) PROXY_METHOD1(bool, AddStream, MediaStreamInterface*) - PROXY_METHOD2(bool, AddStream, MediaStreamInterface*, - const MediaConstraintsInterface*); PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*) PROXY_METHOD1(rtc::scoped_refptr<DtmfSenderInterface>, CreateDtmfSender, AudioTrackInterface*) |