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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java

Issue 2887713002: PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent. (Closed)
Patch Set: rebase Created 3 years, 7 months 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1cc27d316b9b329a502e192a1ecb1cabf63bf444..bd25589d75d012c0e2544393ac33817b3f6b4c4c 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
@@ -33,23 +33,26 @@ public class ServiceWorkerPaymentAppBridge implements PaymentAppFactory.PaymentA
/**
* Invoke a payment app with a given option and matching method data.
*
- * @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 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.
- * @param callback Called after the payment app is finished running.
+ * @param webContents The web contents that invoked PaymentRequest.
+ * @param registrationId The service worker registration ID of the Payment App.
+ * @param origin The origin of this merchant.
+ * @param iframeOrigin The origin of the iframe that invoked PaymentRequest. Same as origin
+ * if PaymentRequest was not invoked from inside an iframe.
+ * @param paymentRequestId The unique identifier of the 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.
+ * @param instrumentId The ID of the PaymentInstrument that was selected by the user.
+ * @param callback Called after the payment app is finished running.
*/
- public static void invokePaymentApp(WebContents webContents, long registrationId,
- String optionId, String origin, String unusedIframeOrigin,
- Set<PaymentMethodData> methodData, PaymentItem total, List<PaymentItem> displayItems,
- Set<PaymentDetailsModifier> modifiers,
+ public static void invokePaymentApp(WebContents webContents, long registrationId, String origin,
+ String iframeOrigin, String paymentRequestId, Set<PaymentMethodData> methodData,
+ PaymentItem total, Set<PaymentDetailsModifier> modifiers, String instrumentId,
PaymentInstrument.InstrumentDetailsCallback callback) {
- nativeInvokePaymentApp(webContents, registrationId, optionId, origin,
+ nativeInvokePaymentApp(webContents, registrationId, origin, iframeOrigin, paymentRequestId,
methodData.toArray(new PaymentMethodData[0]), total,
- modifiers.toArray(new PaymentDetailsModifier[0]), callback);
+ modifiers.toArray(new PaymentDetailsModifier[0]), instrumentId, callback);
}
@CalledByNative
@@ -142,6 +145,7 @@ public class ServiceWorkerPaymentAppBridge implements PaymentAppFactory.PaymentA
* has been resolved.
*/
private static native void nativeInvokePaymentApp(WebContents webContents, long registrationId,
- String optionId, String origin, PaymentMethodData[] methodData, PaymentItem total,
- PaymentDetailsModifier[] modifiers, Object callback);
+ String topLevelOrigin, String paymentRequestOrigin, String paymentRequestId,
+ PaymentMethodData[] methodData, PaymentItem total, PaymentDetailsModifier[] modifiers,
+ String instrumentKey, Object callback);
}
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698