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

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/RTCMediaStreamTrack+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/RTCMediaStreamTrack.h" 11 #import "WebRTC/RTCMediaStreamTrack.h"
12 12
13 #include "webrtc/api/mediastreaminterface.h" 13 #include "webrtc/api/mediastreaminterface.h"
14 #include "webrtc/base/scoped_ptr.h"
14 15
15 typedef NS_ENUM(NSInteger, RTCMediaStreamTrackType) { 16 typedef NS_ENUM(NSInteger, RTCMediaStreamTrackType) {
16 RTCMediaStreamTrackTypeAudio, 17 RTCMediaStreamTrackTypeAudio,
17 RTCMediaStreamTrackTypeVideo, 18 RTCMediaStreamTrackTypeVideo,
18 }; 19 };
19 20
20 NS_ASSUME_NONNULL_BEGIN 21 NS_ASSUME_NONNULL_BEGIN
21 22
22 @interface RTCMediaStreamTrack () 23 @interface RTCMediaStreamTrack ()
23 24
(...skipping 21 matching lines...) Expand all
45 (RTCMediaStreamTrackState)state; 46 (RTCMediaStreamTrackState)state;
46 47
47 + (RTCMediaStreamTrackState)trackStateForNativeState: 48 + (RTCMediaStreamTrackState)trackStateForNativeState:
48 (webrtc::MediaStreamTrackInterface::TrackState)nativeState; 49 (webrtc::MediaStreamTrackInterface::TrackState)nativeState;
49 50
50 + (NSString *)stringForState:(RTCMediaStreamTrackState)state; 51 + (NSString *)stringForState:(RTCMediaStreamTrackState)state;
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