Index: ios/chrome/browser/payments/payment_items_display_coordinator.mm |
diff --git a/ios/chrome/browser/payments/payment_items_display_coordinator.mm b/ios/chrome/browser/payments/payment_items_display_coordinator.mm |
index daa6779caa1fe1df4e1eb3b6c27bf5b8c7232d2a..b6b23da541fcd607a5a2932e4fa50c7df803add6 100644 |
--- a/ios/chrome/browser/payments/payment_items_display_coordinator.mm |
+++ b/ios/chrome/browser/payments/payment_items_display_coordinator.mm |
@@ -4,13 +4,15 @@ |
#import "ios/chrome/browser/payments/payment_items_display_coordinator.h" |
-#import "base/ios/weak_nsobject.h" |
-#include "base/mac/scoped_nsobject.h" |
+#include "base/logging.h" |
#include "ios/web/public/payments/payment_request.h" |
+#if !defined(__has_feature) || !__has_feature(objc_arc) |
+#error "This file requires ARC support." |
+#endif |
+ |
@interface PaymentItemsDisplayCoordinator () { |
- base::WeakNSProtocol<id<PaymentItemsDisplayCoordinatorDelegate>> _delegate; |
- base::scoped_nsobject<PaymentItemsDisplayViewController> _viewController; |
+ PaymentItemsDisplayViewController* _viewController; |
} |
@end |
@@ -18,20 +20,13 @@ |
@implementation PaymentItemsDisplayCoordinator |
@synthesize paymentRequest = _paymentRequest; |
- |
-- (id<PaymentItemsDisplayCoordinatorDelegate>)delegate { |
- return _delegate.get(); |
-} |
- |
-- (void)setDelegate:(id<PaymentItemsDisplayCoordinatorDelegate>)delegate { |
- _delegate.reset(delegate); |
-} |
+@synthesize delegate = _delegate; |
- (void)start { |
BOOL payButtonEnabled = _paymentRequest->selected_credit_card() != nil; |
- _viewController.reset([[PaymentItemsDisplayViewController alloc] |
+ _viewController = [[PaymentItemsDisplayViewController alloc] |
initWithPaymentRequest:_paymentRequest |
- payButtonEnabled:payButtonEnabled]); |
+ payButtonEnabled:payButtonEnabled]; |
[_viewController setDelegate:self]; |
[_viewController loadModel]; |
@@ -44,7 +39,7 @@ |
- (void)stop { |
[[self baseViewController].navigationController |
popViewControllerAnimated:YES]; |
- _viewController.reset(); |
+ _viewController = nil; |
} |
#pragma mark - PaymentItemsDisplayViewControllerDelegate |