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

Side by Side Diff: webrtc/api/peerconnectionfactoryproxy.h

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright 2014 The WebRTC project authors. All Rights Reserved.
3 * Copyright 2014 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ 11 #ifndef WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ 12 #define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
30 13
31 #include <string> 14 #include <string>
32 #include <utility> 15 #include <utility>
33 16
34 #include "talk/app/webrtc/peerconnectioninterface.h" 17 #include "webrtc/api/peerconnectioninterface.h"
35 #include "talk/app/webrtc/proxy.h" 18 #include "webrtc/api/proxy.h"
36 #include "webrtc/base/bind.h" 19 #include "webrtc/base/bind.h"
37 20
38 namespace webrtc { 21 namespace webrtc {
39 22
40 BEGIN_PROXY_MAP(PeerConnectionFactory) 23 BEGIN_PROXY_MAP(PeerConnectionFactory)
41 PROXY_METHOD1(void, SetOptions, const Options&) 24 PROXY_METHOD1(void, SetOptions, const Options&)
42 // Can't use PROXY_METHOD5 because scoped_ptr must be moved. 25 // Can't use PROXY_METHOD5 because scoped_ptr must be moved.
43 // TODO(tommi,hbos): Use of templates to support scoped_ptr? 26 // TODO(tommi,hbos): Use of templates to support scoped_ptr?
44 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 27 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
45 const PeerConnectionInterface::RTCConfiguration& a1, 28 const PeerConnectionInterface::RTCConfiguration& a1,
(...skipping 30 matching lines...) Expand all
76 PeerConnectionObserver* a5) { 59 PeerConnectionObserver* a5) {
77 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3); 60 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3);
78 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); 61 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
79 return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3), 62 return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3),
80 std::move(ptr_a4), a5); 63 std::move(ptr_a4), a5);
81 } 64 }
82 END_PROXY() 65 END_PROXY()
83 66
84 } // namespace webrtc 67 } // namespace webrtc
85 68
86 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ 69 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698