| Index: ios/chrome/browser/payments/payment_request_view_controller.mm
|
| diff --git a/ios/chrome/browser/payments/payment_request_view_controller.mm b/ios/chrome/browser/payments/payment_request_view_controller.mm
|
| index 3daa2ca472ee0432c34332bcc843dcd73cda01c0..aa117a29dffbfed4aad403abff445c7bd43da36a 100644
|
| --- a/ios/chrome/browser/payments/payment_request_view_controller.mm
|
| +++ b/ios/chrome/browser/payments/payment_request_view_controller.mm
|
| @@ -22,6 +22,7 @@
|
| #import "ios/chrome/browser/payments/cells/price_item.h"
|
| #import "ios/chrome/browser/payments/cells/shipping_address_item.h"
|
| #import "ios/chrome/browser/payments/payment_request_util.h"
|
| +#import "ios/chrome/browser/payments/payment_request_view_controller_actions.h"
|
| #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
|
| #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_item.h"
|
| #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
|
| @@ -42,8 +43,8 @@ using payment_request_util::NameLabelFromAutofillProfile;
|
| using payment_request_util::AddressLabelFromAutofillProfile;
|
| using payment_request_util::PhoneNumberLabelFromAutofillProfile;
|
|
|
| -NSString* const kPaymentRequestCollectionViewId =
|
| - @"kPaymentRequestCollectionViewId";
|
| +NSString* const kPaymentRequestCollectionViewID =
|
| + @"kPaymentRequestCollectionViewID";
|
|
|
| namespace {
|
|
|
| @@ -72,7 +73,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
|
|
|
| } // namespace
|
|
|
| -@interface PaymentRequestViewController () {
|
| +@interface PaymentRequestViewController ()<
|
| + PaymentRequestViewControllerActions> {
|
| base::WeakNSProtocol<id<PaymentRequestViewControllerDelegate>> _delegate;
|
| base::scoped_nsobject<UIBarButtonItem> _cancelButton;
|
| base::scoped_nsobject<MDCFlatButton> _payButton;
|
| @@ -91,12 +93,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
|
| _propertyReleaser_PaymentRequestViewController;
|
| }
|
|
|
| -// Called when the user presses the cancel button.
|
| -- (void)onCancel;
|
| -
|
| -// Called when the user presses the confirm button.
|
| -- (void)onConfirm;
|
| -
|
| @end
|
|
|
| @implementation PaymentRequestViewController
|
| @@ -113,7 +109,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
|
|
|
| [self setTitle:l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_TITLE)];
|
|
|
| - // Set up left (cancel) button.
|
| + // Set up leading (cancel) button.
|
| _cancelButton.reset([[UIBarButtonItem alloc]
|
| initWithTitle:l10n_util::GetNSString(
|
| IDS_IOS_PAYMENT_REQUEST_CANCEL_BUTTON)
|
| @@ -128,7 +124,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
|
| setAccessibilityLabel:l10n_util::GetNSString(IDS_ACCNAME_CANCEL)];
|
| [self navigationItem].leftBarButtonItem = _cancelButton;
|
|
|
| - // Set up right (pay) button.
|
| + // Set up trailing (pay) button.
|
| _payButton.reset([[MDCFlatButton alloc] init]);
|
| [_payButton
|
| setTitle:l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_PAY_BUTTON)
|
| @@ -312,7 +308,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
|
|
|
| - (void)viewDidLoad {
|
| [super viewDidLoad];
|
| - self.collectionView.accessibilityIdentifier = kPaymentRequestCollectionViewId;
|
| + self.collectionView.accessibilityIdentifier = kPaymentRequestCollectionViewID;
|
|
|
| // Customize collection view settings.
|
| self.styler.cellStyle = MDCCollectionViewCellStyleCard;
|
|
|