Autofill Credit Card resources.

components/autofill/core/browser/credit_card.cc

 // Copyright 2013 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/core/browser/credit_card.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_regexes.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
+#include "grit/component_scaled_resources.h"
 #include "grit/component_strings.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "third_party/icu/source/i18n/unicode/dtfmtsym.h"
 #include "ui/base/l10n/l10n_util.h"
 
-// TODO(blundell): Eliminate the need for this conditional include.
-// crbug.com/328150
-#if !defined(OS_IOS)
-#include "grit/webkit_resources.h"
-#endif
-
 namespace autofill {
 
 namespace {
 
 const base::char16 kCreditCardObfuscationSymbol = '*';
 
 // This is the maximum obfuscated symbols displayed.
 // It is introduced to avoid rare cases where the credit card number is
 // too large and fills the screen.
 const size_t kMaxObfuscationSize = 20;
@@ skipping 114 matching lines @@
     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 base::string16();
 }
 
 // static
 int CreditCard::IconResourceId(const std::string& type) {
   // TODO(blundell): Either move these resources out of webkit_resources or

[blundell, 2014/03/07 12:10:59]

Hi Thiago,

Sorry I hadn't noticed this before: Would you be up for doing a follow-up CL
removing all of the ifdefing in //components/autofill/core/browser around
crbug.com/328150 (i.e., all the ifdefing that references that bug in comments)?

[tfarina, 2014/03/07 14:37:42]

Yes, but I will have to figure out why it has failed when I actually removed it
in the previous patch set.

   // this function into //components/autofill/content/browser to eliminate the
   // need for this ifdef-ing. crbug.com/328150
 #if defined(OS_IOS)
   return 0;
 #else
   if (type == kAmericanExpressCard)
     return IDR_AUTOFILL_CC_AMEX;
   if (type == kDinersCard)
     return IDR_AUTOFILL_CC_DINERS;
   if (type == kDiscoverCard)
@@ skipping 515 matching lines @@
 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 kUnionPay = "unionPayCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill