Chromium Code Reviews| Index: ios/chrome/browser/payments/payment_request_coordinator.mm |
| diff --git a/ios/chrome/browser/payments/payment_request_coordinator.mm b/ios/chrome/browser/payments/payment_request_coordinator.mm |
| index 6db03c9d0f7f4d81441ea24d32605703469c7aee..9c055def7f8f771490a1b1f977af86515ae9fa55 100644 |
| --- a/ios/chrome/browser/payments/payment_request_coordinator.mm |
| +++ b/ios/chrome/browser/payments/payment_request_coordinator.mm |
| @@ -19,6 +19,7 @@ |
| #include "components/autofill/core/browser/payments/full_card_request.h" |
| #include "components/autofill/core/browser/personal_data_manager.h" |
| #include "components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h" |
| +#include "components/payments/core/payment_request_data_util.h" |
| #include "components/strings/grit/components_strings.h" |
| #include "ios/chrome/browser/application_context.h" |
| #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
| @@ -32,8 +33,8 @@ |
| #endif |
| namespace { |
| -using ::payment_request_util::GetBasicCardResponseFromAutofillCreditCard; |
| -using ::payment_request_util::GetPaymentAddressFromAutofillProfile; |
| +using payments::data_util::GetBasicCardResponseFromAutofillCreditCard; |
| +using payments::data_util::GetPaymentAddressFromAutofillProfile; |
|
please use gerrit instead
2017/03/08 14:46:10
It's recommended to prepend top-level namespaces w
Mathieu
2017/03/08 18:04:26
Done.
|
| } // namespace |
| // The unmask prompt UI for Payment Request. |
| @@ -195,8 +196,9 @@ class FullCardRequester |
| base::ASCIIToUTF16(autofill::data_util::GetPaymentRequestData(card.type()) |
| .basic_card_payment_type); |
| - paymentResponse.details = |
| - GetBasicCardResponseFromAutofillCreditCard(*_paymentRequest, card, cvc); |
| + paymentResponse.details = GetBasicCardResponseFromAutofillCreditCard( |
| + card, cvc, _paymentRequest->billing_profiles(), |
| + GetApplicationContext()->GetApplicationLocale()); |
| if (_paymentRequest->payment_options().request_shipping) { |
| autofill::AutofillProfile* shippingAddress = |
| @@ -204,8 +206,8 @@ class FullCardRequester |
| // TODO(crbug.com/602666): User should get here only if they have selected |
| // a shipping address. |
| DCHECK(shippingAddress); |
| - paymentResponse.shipping_address = |
| - GetPaymentAddressFromAutofillProfile(*shippingAddress); |
| + paymentResponse.shipping_address = GetPaymentAddressFromAutofillProfile( |
| + *shippingAddress, GetApplicationContext()->GetApplicationLocale()); |
| web::PaymentShippingOption* shippingOption = |
| _paymentRequest->selected_shipping_option(); |