Implementing VERIFY_CVV required action.

components/autofill/browser/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 "components/autofill/browser/credit_card.h"
 
 #include <stddef.h>
 
 #include <ostream>
 #include <string>
@@ skipping 202 matching lines @@
 CreditCard::~CreditCard() {}
 
 // static
 const string16 CreditCard::StripSeparators(const string16& number) {
   const char16 kSeparators[] = {'-', ' ', '\0'};
   string16 stripped;
   RemoveChars(number, kSeparators, &stripped);
   return stripped;
 }
 
+// static
+string16 CreditCard::TypeForDisplay(const std::string& type) {
+  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();
+}
+
 std::string CreditCard::GetGUID() const {
   return guid();
 }
 
 string16 CreditCard::GetRawInfo(AutofillFieldType type) const {
   switch (type) {
     case CREDIT_CARD_NAME:
       return name_on_card_;
 
     case CREDIT_CARD_EXP_MONTH:
@@ skipping 176 matching lines @@
   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();
+  return TypeForDisplay(type_);

[Ilya Sherman, 2013/03/27 23:59:23]

nit: Write this as "return CreditCard::TypeForDisplay(type_);" to emphasize that
you're calling a static method.

[Dan Beam, 2013/03/28 03:38:12]

Done.

 }
 
 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;
@@ skipping 221 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";