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

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/RTCMediaConstraints+Private.h

Issue 1965063003: Revert of Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #import "WebRTC/RTCMediaConstraints.h" 11 #import "WebRTC/RTCMediaConstraints.h"
12 12
13 #include <memory> 13 #include <memory>
14 14
15 #include "webrtc/api/mediaconstraintsinterface.h" 15 #include "webrtc/api/mediaconstraintsinterface.h"
16 #include "webrtc/base/scoped_ptr.h"
16 17
17 namespace webrtc { 18 namespace webrtc {
18 19
19 class MediaConstraints : public MediaConstraintsInterface { 20 class MediaConstraints : public MediaConstraintsInterface {
20 public: 21 public:
21 virtual ~MediaConstraints(); 22 virtual ~MediaConstraints();
22 MediaConstraints(); 23 MediaConstraints();
23 MediaConstraints( 24 MediaConstraints(
24 const MediaConstraintsInterface::Constraints& mandatory, 25 const MediaConstraintsInterface::Constraints& mandatory,
25 const MediaConstraintsInterface::Constraints& optional); 26 const MediaConstraintsInterface::Constraints& optional);
(...skipping 19 matching lines...) Expand all
45 - (std::unique_ptr<webrtc::MediaConstraints>)nativeConstraints; 46 - (std::unique_ptr<webrtc::MediaConstraints>)nativeConstraints;
46 47
47 /** Return a native Constraints object representing these constraints */ 48 /** Return a native Constraints object representing these constraints */
48 + (webrtc::MediaConstraintsInterface::Constraints) 49 + (webrtc::MediaConstraintsInterface::Constraints)
49 nativeConstraintsForConstraints: 50 nativeConstraintsForConstraints:
50 (NSDictionary<NSString *, NSString *> *)constraints; 51 (NSDictionary<NSString *, NSString *> *)constraints;
51 52
52 @end 53 @end
53 54
54 NS_ASSUME_NONNULL_END 55 NS_ASSUME_NONNULL_END
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698