Index: chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java |
index 85dec0b2e464130597040576d761f3520b07866e..c44bfaeea66a54db5da4c2d348fc57f70f15f1f8 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java |
@@ -355,6 +355,21 @@ public class PersonalDataManager { |
mBillingAddressId = billingAddressId; |
} |
+ public CreditCard() { |
gone
2016/07/13 21:12:59
Make this constructor call the other one.
this(""
please use gerrit instead
2016/07/14 17:21:43
Done.
|
+ mGUID = ""; |
+ mOrigin = AutofillPreferences.SETTINGS_ORIGIN; |
+ mIsLocal = true; |
+ mIsCached = true; |
+ mName = ""; |
+ mNumber = ""; |
+ mObfuscatedNumber = ""; |
+ mMonth = ""; |
+ mYear = ""; |
+ mBasicCardPaymentType = ""; |
+ mIssuerIconDrawableId = 0; |
+ mBillingAddressId = ""; |
+ } |
+ |
/** TODO(estade): remove this constructor. */ |
@VisibleForTesting |
public CreditCard(String guid, String origin, String name, String number, |
@@ -463,6 +478,14 @@ public class PersonalDataManager { |
mYear = year; |
} |
+ public void setBasicCardPaymentType(String type) { |
+ mBasicCardPaymentType = type; |
+ } |
+ |
+ public void setIssuerIconDrawableId(int id) { |
+ mIssuerIconDrawableId = id; |
+ } |
+ |
public void setBillingAddressId(String id) { |
mBillingAddressId = id; |
} |
@@ -599,6 +622,11 @@ public class PersonalDataManager { |
return nativeGetCreditCardByGUID(mPersonalDataManagerAndroid, guid); |
} |
+ public CreditCard getCreditCardForNumber(String cardNumber) { |
+ ThreadUtils.assertOnUiThread(); |
+ return nativeGetCreditCardForNumber(mPersonalDataManagerAndroid, cardNumber); |
+ } |
+ |
public String setCreditCard(CreditCard card) { |
ThreadUtils.assertOnUiThread(); |
assert card.getIsLocal(); |
@@ -610,6 +638,11 @@ public class PersonalDataManager { |
nativeUpdateServerCardBillingAddress(mPersonalDataManagerAndroid, guid, billingAddressId); |
} |
+ public String getBasicCardPaymentTypeIfValid(String cardNumber) { |
+ ThreadUtils.assertOnUiThread(); |
+ return nativeGetBasicCardPaymentTypeIfValid(mPersonalDataManagerAndroid, cardNumber); |
+ } |
+ |
@VisibleForTesting |
public void addServerCreditCardForTest(CreditCard card) { |
ThreadUtils.assertOnUiThread(); |
@@ -626,7 +659,7 @@ public class PersonalDataManager { |
nativeClearUnmaskedCache(mPersonalDataManagerAndroid, guid); |
} |
- public String getGetAddressLabelForPaymentRequest(AutofillProfile profile) { |
+ public String getAddressLabelForPaymentRequest(AutofillProfile profile) { |
return nativeGetAddressLabelForPaymentRequest(mPersonalDataManagerAndroid, profile); |
} |
@@ -636,6 +669,12 @@ public class PersonalDataManager { |
mPersonalDataManagerAndroid, webContents, guid, delegate); |
} |
+ public void getFullTemporaryCard(WebContents webContents, String cardNumber, String nameOnCard, |
+ String expirationMonth, String expirationYear, FullCardRequestDelegate delegate) { |
+ nativeGetFullTemporaryCardForPaymentRequest(mPersonalDataManagerAndroid, webContents, |
+ cardNumber, nameOnCard, expirationMonth, expirationYear, delegate); |
+ } |
+ |
@VisibleForTesting |
protected void setProfileUseStatsForTesting(String guid, int count, long date) { |
ThreadUtils.assertOnUiThread(); |
@@ -703,10 +742,14 @@ public class PersonalDataManager { |
long nativePersonalDataManagerAndroid); |
private native CreditCard nativeGetCreditCardByGUID(long nativePersonalDataManagerAndroid, |
String guid); |
+ private native CreditCard nativeGetCreditCardForNumber(long nativePersonalDataManagerAndroid, |
+ String cardNumber); |
private native String nativeSetCreditCard(long nativePersonalDataManagerAndroid, |
CreditCard card); |
private native void nativeUpdateServerCardBillingAddress(long nativePersonalDataManagerAndroid, |
String guid, String billingAddressId); |
+ private native String nativeGetBasicCardPaymentTypeIfValid( |
+ long nativePersonalDataManagerAndroid, String cardNumber); |
private native void nativeAddServerCreditCardForTest(long nativePersonalDataManagerAndroid, |
CreditCard card); |
private native void nativeRemoveByGUID(long nativePersonalDataManagerAndroid, String guid); |
@@ -718,6 +761,10 @@ public class PersonalDataManager { |
long nativePersonalDataManagerAndroid, String guid); |
private native void nativeGetFullCardForPaymentRequest(long nativePersonalDataManagerAndroid, |
WebContents webContents, String guid, FullCardRequestDelegate delegate); |
+ private native void nativeGetFullTemporaryCardForPaymentRequest( |
+ long nativePersonalDataManagerAndroid, WebContents webContents, String cardNumber, |
+ String nameOnCard, String expirationMonth, String expirationYear, |
+ FullCardRequestDelegate delegate); |
private static native boolean nativeIsAutofillEnabled(); |
private static native void nativeSetAutofillEnabled(boolean enable); |
private static native boolean nativeIsAutofillManaged(); |