Index: chrome/browser/ui/autofill/autofill_popup_layout_model.cc |
diff --git a/chrome/browser/ui/autofill/autofill_popup_layout_model.cc b/chrome/browser/ui/autofill/autofill_popup_layout_model.cc |
index fe0fae7e1232fad040f23b305568b3f651d04d99..385d472d25dcc03c910ac86ecd1555f3c2568b6d 100644 |
--- a/chrome/browser/ui/autofill/autofill_popup_layout_model.cc |
+++ b/chrome/browser/ui/autofill/autofill_popup_layout_model.cc |
@@ -11,6 +11,7 @@ |
#include "chrome/browser/ui/autofill/autofill_popup_view.h" |
#include "chrome/browser/ui/autofill/popup_constants.h" |
#include "components/autofill/core/browser/autofill_experiments.h" |
+#include "components/autofill/core/browser/credit_card.h" |
#include "components/autofill/core/browser/popup_item_ids.h" |
#include "components/autofill/core/browser/suggestion.h" |
#include "components/autofill/core/common/autofill_util.h" |
@@ -49,15 +50,16 @@ const struct { |
const char* name; |
int id; |
} kDataResources[] = { |
- {"americanExpressCC", IDR_AUTOFILL_CC_AMEX}, |
- {"dinersCC", IDR_AUTOFILL_CC_GENERIC}, |
- {"discoverCC", IDR_AUTOFILL_CC_DISCOVER}, |
- {"genericCC", IDR_AUTOFILL_CC_GENERIC}, |
- {"jcbCC", IDR_AUTOFILL_CC_GENERIC}, |
- {"masterCardCC", IDR_AUTOFILL_CC_MASTERCARD}, |
- {"mirCC", IDR_AUTOFILL_CC_MIR}, |
- {"unionPayCC", IDR_AUTOFILL_CC_UNIONPAY}, |
- {"visaCC", IDR_AUTOFILL_CC_VISA}, |
+ {autofill::kAmericanExpressCard, IDR_AUTOFILL_CC_AMEX}, |
+ {autofill::kDinersCard, IDR_AUTOFILL_CC_DINERS}, |
Jared Saul
2017/05/31 18:26:23
Diners and JCB were both using "IDR_AUTOFILL_CC_GE
Mathieu
2017/05/31 18:27:24
I asked Jason to fix the bug. I updated the assets
jiahuiguo
2017/05/31 18:27:56
Yep, it was a previous bug.
|
+ {autofill::kDiscoverCard, IDR_AUTOFILL_CC_DISCOVER}, |
+ {autofill::kEloCard, IDR_AUTOFILL_CC_ELO}, |
+ {autofill::kGenericCard, IDR_AUTOFILL_CC_GENERIC}, |
+ {autofill::kJCBCard, IDR_AUTOFILL_CC_JCB}, |
+ {autofill::kMasterCard, IDR_AUTOFILL_CC_MASTERCARD}, |
+ {autofill::kMirCard, IDR_AUTOFILL_CC_MIR}, |
+ {autofill::kUnionPay, IDR_AUTOFILL_CC_UNIONPAY}, |
+ {autofill::kVisaCard, IDR_AUTOFILL_CC_VISA}, |
#if defined(OS_ANDROID) |
{"httpWarning", IDR_AUTOFILL_HTTP_WARNING}, |
{"httpsInvalid", IDR_AUTOFILL_HTTPS_INVALID_WARNING}, |