chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java - Issue 2437223002: Revert of 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/PaymentInstrument.java

Issue 2437223002: Revert of Make PaymentOption store a Drawable instead of id (Closed)

Patch Set: 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/PaymentAppFactory.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.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/PaymentInstrument.java

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

index dc4795953278635a2f3711916f0d40ea8ed5a294..c799a7814d292cdd7bc2d8c0ae2cbdbe67d61180 100644

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

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

@@ -4,12 +4,10 @@

package org.chromium.chrome.browser.payments;

-import android.graphics.drawable.Drawable;

+import org.chromium.chrome.browser.payments.ui.PaymentOption;

+import org.chromium.payments.mojom.PaymentItem;

import org.json.JSONObject;

-import org.chromium.chrome.browser.payments.ui.PaymentOption;

-import org.chromium.payments.mojom.PaymentItem;

import java.util.List;

@@ -35,7 +33,7 @@

void onInstrumentDetailsError();

}

- protected PaymentInstrument(String id, String label, String sublabel, Drawable icon) {

+ protected PaymentInstrument(String id, String label, String sublabel, int icon) {

super(id, label, sublabel, icon);

}