Add support for Brazil Elo card in autofill.

chrome/browser/ui/autofill/autofill_popup_layout_model.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "components/grit/components_scaled_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ skipping 18 matching lines @@
 // Size difference between the normal font and the smaller font, in pixels.
 const int kSmallerFontSizeDelta = -1;
 
 const int kHttpWarningIconWidth = 16;
 #endif
 
 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_GENERIC" but now they're not. 
Was this intended?

[Mathieu, 2017/05/31 18:27:24]

I asked Jason to fix the bug. I updated the assets, but probably forgot to add
them here.

[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},
     {"scanCreditCardIcon", IDR_AUTOFILL_CC_SCAN_NEW},
     {"settings", IDR_AUTOFILL_SETTINGS},
     {"create", IDR_AUTOFILL_CREATE},
 #endif
 };
 
 int GetRowHeightFromId(int identifier) {
@@ skipping 231 matching lines @@
 bool AutofillPopupLayoutModel::IsIconAtStart(int frontend_id) const {
   return frontend_id == POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE ||
       (is_credit_card_popup_ && IsIconInCreditCardPopupAtStart());
 }
 
 unsigned int AutofillPopupLayoutModel::GetMargin() const {
   return GetPopupMargin();
 }
 
 }  // namespace autofill