chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java - Issue 2887713002: PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.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 | « chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java ('k') | chrome/browser/android/payments/service_worker_payment_app_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java

index 722c8519c776eab3078a452ceee4b00cc45a8be3..c3d56c0509316b3525f4aa282fc0bac5595fb796 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java

@@ -60,9 +60,9 @@ public class ServiceWorkerPaymentInstrument extends PaymentInstrument {

byte[][] unusedCertificateChain, Map<String, PaymentMethodData> methodData,

PaymentItem total, List<PaymentItem> displayItems,

Map<String, PaymentDetailsModifier> modifiers, InstrumentDetailsCallback callback) {

- ServiceWorkerPaymentAppBridge.invokePaymentApp(mWebContents, mSWRegistrationId,

- mInstrumentId, origin, iframeOrigin, new HashSet<>(methodData.values()), total,

- displayItems, new HashSet<>(modifiers.values()), callback);

+ ServiceWorkerPaymentAppBridge.invokePaymentApp(mWebContents, mSWRegistrationId, origin,

+ iframeOrigin, id, new HashSet<>(methodData.values()), total,

+ new HashSet<>(modifiers.values()), mInstrumentId, callback);

}

@Override