Commit 1c46efd3 authored by jhawkins@chromium.org's avatar jhawkins@chromium.org

AutoFill: Remove a static string16.

BUG=50669
TEST=none

Review URL: http://codereview.chromium.org/3013043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54176 0039d316-1c4b-4281-b951-d872f2087c98
parent 5ec892c3
...@@ -39,8 +39,8 @@ const int kAutoFillPhoneNumberPrefixCount = 3; ...@@ -39,8 +39,8 @@ const int kAutoFillPhoneNumberPrefixCount = 3;
const int kAutoFillPhoneNumberSuffixOffset = 3; const int kAutoFillPhoneNumberSuffixOffset = 3;
const int kAutoFillPhoneNumberSuffixCount = 4; const int kAutoFillPhoneNumberSuffixCount = 4;
const string16::value_type kCreditCardPrefix[] = {'*', 0}; const string16::value_type kCreditCardPrefix[] = {'*',0};
const string16::value_type kLabelSeparator[] = {';',' ', '*', 0}; const string16::value_type kLabelSeparator[] = {';',' ','*',0};
// Combines the |label| string with the last four digits of the credit card // Combines the |label| string with the last four digits of the credit card
// |cc|. If one, the other, or both are empty strings we omit the separator. // |cc|. If one, the other, or both are empty strings we omit the separator.
......
...@@ -7,15 +7,18 @@ ...@@ -7,15 +7,18 @@
#include "app/l10n_util.h" #include "app/l10n_util.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "base/string16.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_type.h" #include "chrome/browser/autofill/autofill_type.h"
#include "chrome/browser/autofill/field_types.h" #include "chrome/browser/autofill/field_types.h"
#include "grit/generated_resources.h" #include "grit/generated_resources.h"
static const string16 kCreditCardSeparators = ASCIIToUTF16(" -"); namespace {
static const char* kCreditCardObfuscationString = "************";
static const AutoFillFieldType kAutoFillCreditCardTypes[] = { const string16::value_type kCreditCardSeparators[] = {' ','-',0};
const char* kCreditCardObfuscationString = "************";
const AutoFillFieldType kAutoFillCreditCardTypes[] = {
CREDIT_CARD_NAME, CREDIT_CARD_NAME,
CREDIT_CARD_NUMBER, CREDIT_CARD_NUMBER,
CREDIT_CARD_TYPE, CREDIT_CARD_TYPE,
...@@ -23,8 +26,9 @@ static const AutoFillFieldType kAutoFillCreditCardTypes[] = { ...@@ -23,8 +26,9 @@ static const AutoFillFieldType kAutoFillCreditCardTypes[] = {
CREDIT_CARD_EXP_4_DIGIT_YEAR, CREDIT_CARD_EXP_4_DIGIT_YEAR,
}; };
static const int kAutoFillCreditCardLength = const int kAutoFillCreditCardLength = arraysize(kAutoFillCreditCardTypes);
arraysize(kAutoFillCreditCardTypes);
} // namespace
CreditCard::CreditCard(const string16& label, int unique_id) CreditCard::CreditCard(const string16& label, int unique_id)
: expiration_month_(0), : expiration_month_(0),
...@@ -309,7 +313,7 @@ bool CreditCard::operator!=(const CreditCard& creditcard) const { ...@@ -309,7 +313,7 @@ bool CreditCard::operator!=(const CreditCard& creditcard) const {
// static // static
bool CreditCard::IsCreditCardNumber(const string16& text) { bool CreditCard::IsCreditCardNumber(const string16& text) {
string16 number; string16 number;
RemoveChars(text, kCreditCardSeparators.c_str(), &number); RemoveChars(text, kCreditCardSeparators, &number);
int sum = 0; int sum = 0;
bool odd = false; bool odd = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment