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

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

Issue 2588913002: EarlGrey tests for Payment Request (base CL) (Closed)
Patch Set: Moved everything except the egtest upsream Created 4 years 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/shipping_address_selection_view_controller.mm
diff --git a/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm b/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
index 8e16f0329bcaaabfdc455bc8b579a29ba93ff203..90493d21d55455b3cba9977819a650284419e28c 100644
--- a/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
+++ b/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
@@ -21,6 +21,10 @@
#include "ios/chrome/grit/ios_strings.h"
#include "ui/base/l10n/l10n_util.h"
+using payment_request_utils::NameLabelFromAutofillProfile;
+using payment_request_utils::AddressLabelFromAutofillProfile;
+using payment_request_utils::PhoneNumberLabelFromAutofillProfile;
+
NSString* const kShippingAddressSelectionCollectionViewId =
@"kShippingAddressSelectionCollectionViewId";
@@ -97,12 +101,10 @@ typedef NS_ENUM(NSInteger, ItemType) {
autofill::AutofillProfile* shippingAddress = _shippingAddresses[i];
ShippingAddressItem* item = [[[ShippingAddressItem alloc]
initWithType:ItemTypeShippingAddress] autorelease];
- item.name = base::SysUTF16ToNSString(
- shippingAddress->GetRawInfo(autofill::NAME_FULL));
- item.address =
- payment_request_utils::AddressLabelFromAutofillProfile(shippingAddress);
- item.phoneNumber = base::SysUTF16ToNSString(
- shippingAddress->GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER));
+ item.accessibilityTraits |= UIAccessibilityTraitButton;
+ item.name = NameLabelFromAutofillProfile(shippingAddress);
+ item.address = AddressLabelFromAutofillProfile(shippingAddress);
+ item.phoneNumber = PhoneNumberLabelFromAutofillProfile(shippingAddress);
if (shippingAddress == _selectedShippingAddress) {
item.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
_selectedItem = item;

Powered by Google App Engine
This is Rietveld 408576698