projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
components
/
autofill
/
content
/
browser
/
wallet
/
full_wallet.cc
diff --git
a/src/components/autofill/content/browser/wallet/full_wallet.cc
b/src/components/autofill/content/browser/wallet/full_wallet.cc
index
d4b390a
..
fda8811
100644
(file)
--- a/
src/components/autofill/content/browser/wallet/full_wallet.cc
+++ b/
src/components/autofill/content/browser/wallet/full_wallet.cc
@@
-154,16
+154,17
@@
scoped_ptr<FullWallet>
return wallet.Pass();
}
return wallet.Pass();
}
-base::string16 FullWallet::GetInfo(const AutofillType& type) {
+base::string16 FullWallet::GetInfo(const std::string& app_locale,
+ const AutofillType& type) {
switch (type.GetStorableType()) {
case CREDIT_CARD_NUMBER:
switch (type.GetStorableType()) {
case CREDIT_CARD_NUMBER:
- return base::
UTF8
ToUTF16(GetPan());
+ return base::
ASCII
ToUTF16(GetPan());
case CREDIT_CARD_NAME:
return billing_address()->recipient_name();
case CREDIT_CARD_VERIFICATION_CODE:
case CREDIT_CARD_NAME:
return billing_address()->recipient_name();
case CREDIT_CARD_VERIFICATION_CODE:
- return base::
UTF8
ToUTF16(GetCvn());
+ return base::
ASCII
ToUTF16(GetCvn());
case CREDIT_CARD_EXP_MONTH:
if (expiration_month() == 0)
case CREDIT_CARD_EXP_MONTH:
if (expiration_month() == 0)
@@
-182,7
+183,7
@@
base::string16 FullWallet::GetInfo(const AutofillType& type) {
case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR:
if (expiration_month() == 0 || expiration_year() == 0)
case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR:
if (expiration_month() == 0 || expiration_year() == 0)
-
return base::string16();
+ return base::string16();
return base::IntToString16(expiration_month()) + base::ASCIIToUTF16("/") +
base::IntToString16(expiration_year() % 100);
return base::IntToString16(expiration_month()) + base::ASCIIToUTF16("/") +
base::IntToString16(expiration_year() % 100);
@@
-194,17
+195,27
@@
base::string16 FullWallet::GetInfo(const AutofillType& type) {
case CREDIT_CARD_TYPE: {
std::string internal_type =
case CREDIT_CARD_TYPE: {
std::string internal_type =
- CreditCard::GetCreditCardType(base::
UTF8
ToUTF16(GetPan()));
+ CreditCard::GetCreditCardType(base::
ASCII
ToUTF16(GetPan()));
if (internal_type == kGenericCard)
return base::string16();
return CreditCard::TypeForDisplay(internal_type);
}
if (internal_type == kGenericCard)
return base::string16();
return CreditCard::TypeForDisplay(internal_type);
}
- default:
- NOTREACHED();
- }
+ default: {
+ switch (type.group()) {
+ case NAME_BILLING:
+ case PHONE_BILLING:
+ case ADDRESS_BILLING:
+ return billing_address_->GetInfo(type, app_locale);
- return base::string16();
+ case CREDIT_CARD:
+ NOTREACHED();
+
+ default:
+ return shipping_address_->GetInfo(type, app_locale);
+ }
+ }
+ }
}
bool FullWallet::HasRequiredAction(RequiredAction action) const {
}
bool FullWallet::HasRequiredAction(RequiredAction action) const {
@@
-216,11
+227,16
@@
bool FullWallet::HasRequiredAction(RequiredAction action) const {
base::string16 FullWallet::TypeAndLastFourDigits() {
CreditCard card;
base::string16 FullWallet::TypeAndLastFourDigits() {
CreditCard card;
- card.SetRawInfo(CREDIT_CARD_NUMBER,
- GetInfo(AutofillType(CREDIT_CARD_NUMBER)));
+ card.SetRawInfo(CREDIT_CARD_NUMBER, base::ASCIIToUTF16(GetPan()));
return card.TypeAndLastFourDigits();
}
return card.TypeAndLastFourDigits();
}
+const std::string& FullWallet::GetPan() {
+ if (pan_.empty())
+ DecryptCardInfo();
+ return pan_;
+}
+
bool FullWallet::operator==(const FullWallet& other) const {
if (expiration_month_ != other.expiration_month_)
return false;
bool FullWallet::operator==(const FullWallet& other) const {
if (expiration_month_ != other.expiration_month_)
return false;
@@
-307,12
+323,6
@@
void FullWallet::DecryptCardInfo() {
pan_ = iin_ + card_info.substr(0, split);
}
pan_ = iin_ + card_info.substr(0, split);
}
-const std::string& FullWallet::GetPan() {
- if (pan_.empty())
- DecryptCardInfo();
- return pan_;
-}
-
const std::string& FullWallet::GetCvn() {
if (cvn_.empty())
DecryptCardInfo();
const std::string& FullWallet::GetCvn() {
if (cvn_.empty())
DecryptCardInfo();