| Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java
|
| index ec61feb7c8f75c49d39f53f3e24dea73242b66ff..fe0581718d31a46872be236b8f67dcac8b50e968 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java
|
| @@ -68,15 +68,19 @@ public class ServiceWorkerPaymentAppBridge implements PaymentAppFactory.PaymentA
|
| * @param webContents The web contents that invoked PaymentRequest.
|
| * @param registrationId The service worker registration ID of the Payment App.
|
| * @param optionId The ID of the PaymentOption that was selected by the user.
|
| + * @param origin The origin of this merchant.
|
| + * @param iframeOrigin The origin of the iframe browsing context that invoked
|
| + * PaymentRequest.
|
| * @param methodData The PaymentMethodData objects that are relevant for this payment
|
| * app.
|
| * @param total The PaymentItem that represents the total cost of the payment.
|
| * @param modifiers Payment method specific modifiers to the payment items and the total.
|
| */
|
| public static void invokePaymentApp(WebContents webContents, long registrationId,
|
| - String optionId, String origin, Set<PaymentMethodData> methodData, PaymentItem total,
|
| - List<PaymentItem> displayItems, Set<PaymentDetailsModifier> modifiers) {
|
| - nativeInvokePaymentApp(webContents, registrationId, optionId, origin,
|
| + String optionId, String origin, String iframeOrigin, Set<PaymentMethodData> methodData,
|
| + PaymentItem total, List<PaymentItem> displayItems,
|
| + Set<PaymentDetailsModifier> modifiers) {
|
| + nativeInvokePaymentApp(webContents, registrationId, optionId, origin, iframeOrigin,
|
| methodData.toArray(new PaymentMethodData[0]), total,
|
| modifiers.toArray(new PaymentDetailsModifier[0]));
|
| }
|
| @@ -164,6 +168,6 @@ public class ServiceWorkerPaymentAppBridge implements PaymentAppFactory.PaymentA
|
| private static native void nativeGetAllAppManifests(WebContents webContents, Object callback);
|
|
|
| private static native void nativeInvokePaymentApp(WebContents webContents, long registrationId,
|
| - String optionId, String origin, PaymentMethodData[] methodData, PaymentItem total,
|
| - PaymentDetailsModifier[] modifiers);
|
| + String optionId, String origin, String iframeOrigin, PaymentMethodData[] methodData,
|
| + PaymentItem total, PaymentDetailsModifier[] modifiers);
|
| }
|
|
|