chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java - Issue 2436363002: [Reland] Make PaymentOption store a Drawable instead of id

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/PaymentRequestImpl.java

Issue 2436363002: [Reland] Make PaymentOption store a Drawable instead of id (Closed)

Patch Set: Fix integraiton test Created 4 years, 2 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/PaymentInstrument.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentOption.java » ('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/PaymentRequestImpl.java

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

index 0535e1ef4eff5b03e6adc11e9a409841bab74ea5..11123a68fd063c5c0ac93a8897e808d3b4d9c0b5 100644

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

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

@@ -234,7 +234,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie

}

});

- mApps = PaymentAppFactory.create(webContents);

+ mApps = PaymentAppFactory.create(mContext, webContents);

mAddressEditor = new AddressEditor();

mCardEditor = new CardEditor(webContents, mAddressEditor, sObserverForTest);

@@ -659,7 +659,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie

for (int i = 0; i < options.length; i++) {

PaymentShippingOption option = options[i];

result.add(new PaymentOption(option.id, option.label,

- formatter.format(option.amount.value), PaymentOption.NO_ICON));

+ formatter.format(option.amount.value), null));

if (option.selected) selectedItemIndex = i;

}