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

Unified Diff: ios/chrome/browser/payments/payment_items_display_coordinator.mm

Issue 2710493006: [ObjC ARC] Converts ios/chrome/browser/payments:payments to ARC. (Closed)
Patch Set: rebase? Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698