[Payment Request] Displays Contact Info in the payment summary view

ios/chrome/browser/payments/shipping_address_selection_view_controller.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/payments/shipping_address_selection_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/application_context.h"
+#import "ios/chrome/browser/payments/cells/autofill_profile_item.h"
 #import "ios/chrome/browser/payments/cells/payments_text_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/shipping_address_selection_view_controller_actions.h"
 #import "ios/chrome/browser/ui/autofill/cells/status_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #include "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-using payment_request_util::NameLabelFromAutofillProfile;
-using payment_request_util::AddressLabelFromAutofillProfile;
-using payment_request_util::PhoneNumberLabelFromAutofillProfile;
+using payment_request_util::GetNameLabelFromAutofillProfile;
+using payment_request_util::GetAddressLabelFromAutofillProfile;
+using payment_request_util::GetPhoneNumberLabelFromAutofillProfile;

[please use gerrit instead, 2017/02/26 01:55:25]

Ditto

[Moe, 2017/02/27 16:43:23]

Done.

 
 NSString* const kShippingAddressSelectionCollectionViewID =
     @"kShippingAddressSelectionCollectionViewID";
 
 namespace {
 
 const CGFloat kSeparatorEdgeInset = 14;
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {
   SectionIdentifierShippingAddress = kSectionIdentifierEnumZero,
 };
 
 typedef NS_ENUM(NSInteger, ItemType) {
   ItemTypeSpinner = kItemTypeEnumZero,
   ItemTypeMessage,
   ItemTypeShippingAddress,  // This is a repeated item type.
   ItemTypeAddShippingAddress,
 };
 
 }  // namespace
 
 @interface ShippingAddressSelectionViewController ()<
     ShippingAddressSelectionViewControllerActions> {
   // The PaymentRequest object owning an instance of web::PaymentRequest as
   // provided by the page invoking the Payment Request API. This is a weak
   // pointer and should outlive this class.
   PaymentRequest* _paymentRequest;
 
   // The currently selected item. May be nil.
-  __weak ShippingAddressItem* _selectedItem;
+  __weak AutofillProfileItem* _selectedItem;
 }
 
 @end
 
 @implementation ShippingAddressSelectionViewController
 
 @synthesize pending = _pending;
 @synthesize errorMessage = _errorMessage;
 @synthesize delegate = _delegate;
 
@@ skipping 45 matching lines @@
     messageItem.image = NativeImage(IDR_IOS_PAYMENTS_WARNING);
   } else {
     messageItem.text =
         payment_request_util::GetShippingAddressSelectorInfoMessage(
             _paymentRequest);
   }
   [model addItem:messageItem
       toSectionWithIdentifier:SectionIdentifierShippingAddress];
 
   for (const auto& shippingAddress : _paymentRequest->shipping_profiles()) {
-    ShippingAddressItem* item =
-        [[ShippingAddressItem alloc] initWithType:ItemTypeShippingAddress];
+    AutofillProfileItem* item =
+        [[AutofillProfileItem alloc] initWithType:ItemTypeShippingAddress];
     item.accessibilityTraits |= UIAccessibilityTraitButton;
-    item.name = NameLabelFromAutofillProfile(shippingAddress);
-    item.address = AddressLabelFromAutofillProfile(shippingAddress);
-    item.phoneNumber = PhoneNumberLabelFromAutofillProfile(shippingAddress);
+    item.name = GetNameLabelFromAutofillProfile(shippingAddress);
+    item.address = GetAddressLabelFromAutofillProfile(shippingAddress);
+    item.phoneNumber = GetPhoneNumberLabelFromAutofillProfile(shippingAddress);
     if (_paymentRequest->selected_shipping_profile() == shippingAddress) {
       item.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
       _selectedItem = item;
     }
     [model addItem:item
         toSectionWithIdentifier:SectionIdentifierShippingAddress];
   }
 
   PaymentsTextItem* addShippingAddress =
       [[PaymentsTextItem alloc] initWithType:ItemTypeAddShippingAddress];
@@ skipping 57 matching lines @@
   CollectionViewItem* item = [model itemAtIndexPath:indexPath];
   if (item.type == ItemTypeShippingAddress) {
     // Update the currently selected cell, if any.
     if (_selectedItem) {
       _selectedItem.accessoryType = MDCCollectionViewCellAccessoryNone;
       [self reconfigureCellsForItems:@[ _selectedItem ]
              inSectionWithIdentifier:SectionIdentifierShippingAddress];
     }
 
     // Update the newly selected cell.
-    ShippingAddressItem* newlySelectedItem =
-        base::mac::ObjCCastStrict<ShippingAddressItem>(item);
+    AutofillProfileItem* newlySelectedItem =
+        base::mac::ObjCCastStrict<AutofillProfileItem>(item);
     newlySelectedItem.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
     [self reconfigureCellsForItems:@[ newlySelectedItem ]
            inSectionWithIdentifier:SectionIdentifierShippingAddress];
 
     // Update the reference to the selected item.
     _selectedItem = newlySelectedItem;
 
     // Notify the delegate of the selection.
     NSInteger index = [model indexInItemTypeForIndexPath:indexPath];
     DCHECK(index < (NSInteger)_paymentRequest->shipping_profiles().size());
@@ skipping 29 matching lines @@
     hidesInkViewAtIndexPath:(NSIndexPath*)indexPath {
   NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
   if (type == ItemTypeMessage) {
     return YES;
   } else {
     return NO;
   }
 }
 
 @end