Index: ios/chrome/browser/app_startup_parameters.mm |
diff --git a/ios/chrome/browser/app_startup_parameters.mm b/ios/chrome/browser/app_startup_parameters.mm |
index dd43c246b4a2e16654aa35aa159c35565f9f1c36..c237498294dabff03f5202b25e42e177b468be4f 100644 |
--- a/ios/chrome/browser/app_startup_parameters.mm |
+++ b/ios/chrome/browser/app_startup_parameters.mm |
@@ -5,14 +5,17 @@ |
#import "ios/chrome/browser/app_startup_parameters.h" |
#include "base/logging.h" |
-#import "base/mac/scoped_nsobject.h" |
#include "ios/chrome/browser/experimental_flags.h" |
#import "ios/chrome/browser/xcallback_parameters.h" |
#include "url/gurl.h" |
+#if !defined(__has_feature) || !__has_feature(objc_arc) |
+#error "This file requires ARC support." |
+#endif |
+ |
@implementation AppStartupParameters { |
GURL _externalURL; |
- base::scoped_nsobject<XCallbackParameters> _xCallbackParameters; |
+ XCallbackParameters* _xCallbackParameters; |
BOOL _launchVoiceSearch; |
BOOL _launchInIncognito; |
BOOL _launchQRScanner; |
@@ -26,7 +29,7 @@ |
} |
- (XCallbackParameters*)xCallbackParameters { |
sdefresne
2016/12/12 19:37:00
You can synthesize this property:
@synthesize xCa
stkhapugin
2016/12/13 13:31:11
Done.
|
- return _xCallbackParameters.get(); |
+ return _xCallbackParameters; |
} |
- (instancetype)init { |
@@ -43,7 +46,7 @@ |
self = [super init]; |
if (self) { |
_externalURL = GURL(externalURL); |
sdefresne
2016/12/12 19:37:00
nit: no need to invoke a copy constructor here, ju
stkhapugin
2016/12/13 13:31:11
Done.
|
- _xCallbackParameters.reset([xCallbackParameters retain]); |
+ _xCallbackParameters = xCallbackParameters; |
} |
return self; |
} |
@@ -51,7 +54,7 @@ |
- (NSString*)description { |
return [NSString stringWithFormat:@"ExternalURL: %s \nXCallbackParams: %@", |
_externalURL.spec().c_str(), |
- _xCallbackParameters.get()]; |
+ _xCallbackParameters]; |
} |
#pragma mark Property implementation. |