Chromium Code Reviews| Index: components/autofill/core/browser/credit_card.cc |
| diff --git a/components/autofill/core/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc |
| index 92e82c3125a05c46553a78233c39763d9cc5dd02..cec613b1c87519e3273316f6b27071525cd20e8a 100644 |
| --- a/components/autofill/core/browser/credit_card.cc |
| +++ b/components/autofill/core/browser/credit_card.cc |
| @@ -25,11 +25,14 @@ |
| #include "components/autofill/core/browser/validation.h" |
| #include "components/autofill/core/common/form_field_data.h" |
| #include "grit/component_strings.h" |
| -#include "grit/webkit_resources.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" |
| +#if !defined(OS_IOS) |
|
Ilya Sherman
2013/12/11 22:50:38
nit: Please include a TODO + bug for this as well.
blundell
2013/12/12 20:53:54
Done.
|
| +#include "grit/webkit_resources.h" |
| +#endif |
| + |
| namespace autofill { |
| namespace { |
| @@ -164,6 +167,12 @@ base::string16 CreditCard::TypeForDisplay(const std::string& type) { |
| // static |
| int CreditCard::IconResourceId(const std::string& type) { |
| + // TODO(blundell): Either move these resources out of webkit_resources or |
| + // this function into //components/autofill/content/browser to eliminate the |
| + // need for this ifdef-ing. |
|
Ilya Sherman
2013/12/11 22:50:38
Please file a bug for this and include a link here
blundell
2013/12/12 20:53:54
Done.
|
| +#if defined(OS_IOS) |
| + return 0; |
| +#else |
| if (type == kAmericanExpressCard) |
| return IDR_AUTOFILL_CC_AMEX; |
| if (type == kDinersCard) |
| @@ -183,6 +192,7 @@ int CreditCard::IconResourceId(const std::string& type) { |
| // include a new card. |
| DCHECK_EQ(kGenericCard, type); |
| return IDR_AUTOFILL_CC_GENERIC; |
| +#endif |
|
Ilya Sherman
2013/12/11 22:50:38
nit: "#endif // defined(OS_IOS)"
blundell
2013/12/12 20:53:54
Done.
|
| } |
| // static |