Commit 94bbd0c8 authored by waltercacau's avatar waltercacau Committed by Commit bot

Parsing new Android Pay Payment Request API member: minGooglePlayServicesVersion

BUG=675266

Review-Url: https://codereview.chromium.org/2578323006
Cr-Commit-Position: refs/heads/master@{#439846}
parent 7f99e933
...@@ -128,6 +128,8 @@ struct PaymentMethodData { ...@@ -128,6 +128,8 @@ struct PaymentMethodData {
array<AndroidPayCardNetwork> allowed_card_networks; array<AndroidPayCardNetwork> allowed_card_networks;
AndroidPayTokenization tokenization_type; AndroidPayTokenization tokenization_type;
array<AndroidPayTokenizationParameter> parameters; array<AndroidPayTokenizationParameter> parameters;
// Value of 0 means the merchant did not specify or it was an invalid value.
int32 min_google_play_services_version;
}; };
struct PaymentDetailsModifier { struct PaymentDetailsModifier {
......
...@@ -11,4 +11,5 @@ dictionary AndroidPayMethodData { ...@@ -11,4 +11,5 @@ dictionary AndroidPayMethodData {
DOMString merchantId; DOMString merchantId;
sequence<DOMString> allowedCardNetworks; sequence<DOMString> allowedCardNetworks;
AndroidPayTokenization paymentMethodTokenizationParameters; AndroidPayTokenization paymentMethodTokenizationParameters;
DOMString minGooglePlayServicesVersion;
}; };
...@@ -253,6 +253,17 @@ void maybeSetAndroidPayMethodData(const ScriptValue& input, ...@@ -253,6 +253,17 @@ void maybeSetAndroidPayMethodData(const ScriptValue& input,
output->merchant_name = androidPay.merchantName(); output->merchant_name = androidPay.merchantName();
output->merchant_id = androidPay.merchantId(); output->merchant_id = androidPay.merchantId();
// 0 means the merchant did not specify or it was an invalid value
output->min_google_play_services_version = 0;
if (androidPay.hasMinGooglePlayServicesVersion()) {
bool ok = false;
int minGooglePlayServicesVersion =
androidPay.minGooglePlayServicesVersion().toIntStrict(&ok);
if (ok) {
output->min_google_play_services_version = minGooglePlayServicesVersion;
}
}
if (androidPay.hasAllowedCardNetworks()) { if (androidPay.hasAllowedCardNetworks()) {
for (const String& allowedCardNetwork : androidPay.allowedCardNetworks()) { for (const String& allowedCardNetwork : androidPay.allowedCardNetworks()) {
for (size_t i = 0; i < arraysize(kAndroidPayNetwork); ++i) { for (size_t i = 0; i < arraysize(kAndroidPayNetwork); ++i) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment