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

Side by Side Diff: webrtc/api/objc/RTCIceServer.mm

Issue 1773743002: Restore type attributes and remove extraneous nullability annotations for Objective-C Mac build (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | « webrtc/api/objc/RTCIceServer.h ('k') | webrtc/api/objc/RTCMediaConstraints.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "RTCIceServer.h" 11 #import "RTCIceServer.h"
12 12
13 #import "webrtc/api/objc/RTCIceServer+Private.h" 13 #import "webrtc/api/objc/RTCIceServer+Private.h"
14 #import "webrtc/base/objc/NSString+StdString.h" 14 #import "webrtc/base/objc/NSString+StdString.h"
15 15
16 @implementation RTCIceServer 16 @implementation RTCIceServer
17 // TODO(hjon): Update nullability types. See http://crbug/webrtc/5592
18 17
19 @synthesize urlStrings = _urlStrings; 18 @synthesize urlStrings = _urlStrings;
20 @synthesize username = _username; 19 @synthesize username = _username;
21 @synthesize credential = _credential; 20 @synthesize credential = _credential;
22 21
23 - (instancetype)initWithURLStrings:(NSArray *)urlStrings { 22 - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings {
24 // - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings {
25 NSParameterAssert(urlStrings.count); 23 NSParameterAssert(urlStrings.count);
26 return [self initWithURLStrings:urlStrings 24 return [self initWithURLStrings:urlStrings
27 username:nil 25 username:nil
28 credential:nil]; 26 credential:nil];
29 } 27 }
30 28
31 - (instancetype)initWithURLStrings:(NSArray *)urlStrings 29 - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
32 // - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
33 username:(NSString *)username 30 username:(NSString *)username
34 credential:(NSString *)credential { 31 credential:(NSString *)credential {
35 NSParameterAssert(urlStrings.count); 32 NSParameterAssert(urlStrings.count);
36 if (self = [super init]) { 33 if (self = [super init]) {
37 _urlStrings = [[NSArray alloc] initWithArray:urlStrings copyItems:YES]; 34 _urlStrings = [[NSArray alloc] initWithArray:urlStrings copyItems:YES];
38 _username = [username copy]; 35 _username = [username copy];
39 _credential = [credential copy]; 36 _credential = [credential copy];
40 } 37 }
41 return self; 38 return self;
42 } 39 }
(...skipping 30 matching lines...) Expand all
73 } 70 }
74 NSString *username = [NSString stringForStdString:nativeServer.username]; 71 NSString *username = [NSString stringForStdString:nativeServer.username];
75 NSString *credential = [NSString stringForStdString:nativeServer.password]; 72 NSString *credential = [NSString stringForStdString:nativeServer.password];
76 self = [self initWithURLStrings:urls 73 self = [self initWithURLStrings:urls
77 username:username 74 username:username
78 credential:credential]; 75 credential:credential];
79 return self; 76 return self;
80 } 77 }
81 78
82 @end 79 @end
OLDNEW
« no previous file with comments | « webrtc/api/objc/RTCIceServer.h ('k') | webrtc/api/objc/RTCMediaConstraints.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698