requestAutocomplete - more elaborate suggestion labels

chrome/browser/autofill/credit_card.cc

 // Copyright (c) 2012 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/autofill/credit_card.h"
 
 #include <stddef.h>
 
 #include <ostream>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_regexes.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/validation.h"
 #include "chrome/common/form_field_data.h"
 #include "grit/generated_resources.h"
+#include "grit/webkit_resources.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "third_party/icu/public/i18n/unicode/dtfmtsym.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 const char16 kCreditCardObfuscationSymbol = '*';
 
 std::string GetCreditCardType(const string16& number) {
   // Don't check for a specific type if this is not a credit card number.
@@ skipping 26 matching lines @@
   int first_two_digits = first_three_digits / 10;
   int first_digit = first_two_digits / 10;
 
   switch (number.length()) {
     case 13:
       if (first_digit == 4)
         return kVisaCard;
 
       break;
     case 14:
-      if (first_three_digits >= 300 && first_three_digits <=305)
+      if (first_three_digits >= 300 && first_three_digits <= 305)
         return kDinersCard;
 
       if (first_digit == 36)
         return kDinersCard;
 
       break;
     case 15:
       if (first_two_digits == 34 || first_two_digits == 37)
         return kAmericanExpressCard;
 
@@ skipping 25 matching lines @@
     case 19:
       if (first_four_digits == 6334 || first_four_digits == 6767)
         return kSoloCard;
 
       break;
   }
 
   return kGenericCard;
 }
 
-string16 GetCreditCardTypeDisplayName(const std::string& card_type) {
-  if (card_type == kAmericanExpressCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_AMEX);
-
-  if (card_type == kDinersCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DINERS);
-
-  if (card_type == kDiscoverCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DISCOVER);
-
-  if (card_type == kJCBCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_JCB);
-
-  if (card_type == kMasterCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_MASTERCARD);
-
-  if (card_type == kSoloCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_SOLO);
-
-  if (card_type == kVisaCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_VISA);
-
-  // If you hit this DCHECK, the above list of cases needs to be updated to
-  // include a new card.
-  DCHECK_EQ(kGenericCard, card_type);
-  return string16();
-}
-
 bool ConvertYear(const string16& year, int* num) {
   // If the |year| is empty, clear the stored value.
   if (year.empty()) {
     *num = 0;
     return true;
   }
 
   // Try parsing the |year| as a number.
   if (base::StringToInt(year, num))
     return true;
@@ skipping 112 matching lines @@
 
     case CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR: {
       string16 month = ExpirationMonthAsString();
       string16 year = Expiration4DigitYearAsString();
       if (!month.empty() && !year.empty())
         return month + ASCIIToUTF16("/") + year;
       return string16();
     }
 
     case CREDIT_CARD_TYPE:
-      return GetCreditCardTypeDisplayName(type_);
+      return TypeForDisplay();
 
     case CREDIT_CARD_NUMBER:
       return number_;
 
     case CREDIT_CARD_VERIFICATION_CODE:
       // Chrome doesn't store credit card verification codes.
       return string16();
 
     default:
       // ComputeDataPresentForArray will hit this repeatedly.
@@ skipping 138 matching lines @@
 string16 CreditCard::LastFourDigits() const {
   static const size_t kNumLastDigits = 4;
 
   string16 number = StripSeparators(number_);
   if (number.size() < kNumLastDigits)
     return string16();
 
   return number.substr(number.size() - kNumLastDigits, kNumLastDigits);
 }
 
+string16 CreditCard::TypeForDisplay() const {
+  if (type_ == kAmericanExpressCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_AMEX);
+  if (type_ == kDinersCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DINERS);
+  if (type_ == kDiscoverCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DISCOVER);
+  if (type_ == kJCBCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_JCB);
+  if (type_ == kMasterCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_MASTERCARD);
+  if (type_ == kSoloCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_SOLO);
+  if (type_ == kVisaCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_VISA);
+
+  // If you hit this DCHECK, the above list of cases needs to be updated to
+  // include a new card.
+  DCHECK_EQ(kGenericCard, type_);
+  return string16();
+}
+
+string16 CreditCard::TypeAndLastFourDigits() const {
+  string16 type = TypeForDisplay();
+  // TODO(estade): type may be empty, we probably want to return
+  // "Card - 1234" or something in that case.
+
+  string16 digits = LastFourDigits();
+  if (digits.empty())
+    return type;
+
+  // TODO(estade): i18n.
+  return type + ASCIIToUTF16(" - ") + digits;
+}

[Ilya Sherman, 2013/01/24 04:27:27]

This method seems like it should be implemented by the UI code, rather than by
the CreditCard class.

[Evan Stade, 2013/01/24 23:34:25]

I wanted to keep this close to similar functions, i.e. all those functions which
are dealing with presentation and returning string16.

+
+int CreditCard::IconResourceId() const {
+  if (type_ == kAmericanExpressCard)
+    return IDR_AUTOFILL_CC_AMEX;
+  if (type_ == kDinersCard)
+    return IDR_AUTOFILL_CC_DINERS;
+  if (type_ == kDiscoverCard)
+    return IDR_AUTOFILL_CC_DISCOVER;
+  if (type_ == kJCBCard)
+    return IDR_AUTOFILL_CC_JCB;
+  if (type_ == kMasterCard)
+    return IDR_AUTOFILL_CC_MASTERCARD;
+  if (type_ == kSoloCard)
+    return IDR_AUTOFILL_CC_SOLO;
+  if (type_ == kVisaCard)
+    return IDR_AUTOFILL_CC_VISA;
+
+  // If you hit this DCHECK, the above list of cases needs to be updated to
+  // include a new card.
+  DCHECK_EQ(kGenericCard, type_);
+  return IDR_AUTOFILL_CC_GENERIC;
+}

[Ilya Sherman, 2013/01/24 04:27:27]

Can AutofillPopupControllerImpl::GetIconResourceID() be updated to use this
method as well, rather than re-defining the mapping?

[Evan Stade, 2013/01/24 23:34:25]

I actually spent a while looking at this, but I'd rather not. Eventually we
should be able to delete AutofillPopupControllerImpl's code, and pass around
IDRs for icons instead of string identifiers (string16 is especially weird given
that it's not something that's used for display). So for now, I'd prefer to
leave the code as is rather than adding new code that I plan to delete. I filed
a bug: crbug.com/172101

Currently this mapping exists 4 times in chrome. This patch reduces that to 3.
Fixing the bug I filed will reduce it to 1.

+
 void CreditCard::operator=(const CreditCard& credit_card) {
   if (this == &credit_card)
     return;
 
   number_ = credit_card.number_;
   name_on_card_ = credit_card.name_on_card_;
   type_ = credit_card.type_;
   expiration_month_ = credit_card.expiration_month_;
   expiration_year_ = credit_card.expiration_year_;
   guid_ = credit_card.guid_;
@@ skipping 184 matching lines @@
 // webkit/glue. We send these strings to WebKit, which then asks
 // WebKitPlatformSupportImpl to load the image data.
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kSoloCard = "soloCC";
 const char* const kVisaCard = "visaCC";