PaymentRequest specific card issuer icons

chrome/browser/autofill/android/personal_data_manager_android.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 "chrome/browser/autofill/android/personal_data_manager_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 13 matching lines @@
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/country_names.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/payments/full_card_request.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_contents.h"
+#include "grit/components_scaled_resources.h"
 #include "jni/PersonalDataManager_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace autofill {
 namespace {
@@ skipping 78 matching lines @@
   }
   MaybeSetRawInfo(profile, autofill::PHONE_HOME_WHOLE_NUMBER,
                   Java_AutofillProfile_getPhoneNumber(env, jprofile.obj()));
   MaybeSetRawInfo(profile, autofill::EMAIL_ADDRESS,
                   Java_AutofillProfile_getEmailAddress(env, jprofile.obj()));
   profile->set_language_code(
       ConvertJavaStringToUTF8(
           Java_AutofillProfile_getLanguageCode(env, jprofile.obj())));
 }
 
-// Mapping from Chrome card types to basic card payment spec.
+// Mapping from Chrome card types to PaymentRequest basic card payment spec and
+// icons. Note that "generic" is not in the spec.
 // https://w3c.github.io/browser-payment-api/specs/basic-card-payment.html#method-id
-// Note that "generic" is not in the spec.
-const struct {
+const struct PaymentRequestData {
   const char* card_type;
   const char* basic_card_payment_type;
-} kBasicCardPaymentTypes[] {
-  {"genericCC", "generic"},
-  {"americanExpressCC", "amex"},
-  {"dinersCC", "diners"},
-  {"discoverCC", "discover"},
-  {"jcbCC", "jcb"},
-  {"masterCardCC", "mastercard"},
-  {"visaCC", "visa"}
+  const int icon_resource_id;
+} kPaymentRequestData[] {
+  {"genericCC", "generic", IDR_AUTOFILL_PR_GENERIC},
+  {"americanExpressCC", "amex", IDR_AUTOFILL_PR_AMEX},
+  {"dinersCC", "diners", IDR_AUTOFILL_PR_GENERIC},
+  {"discoverCC", "discover", IDR_AUTOFILL_PR_DISCOVER},
+  {"jcbCC", "jcb", IDR_AUTOFILL_PR_GENERIC},
+  {"masterCardCC", "mastercard", IDR_AUTOFILL_PR_MASTERCARD},
+  {"visaCC", "visa", IDR_AUTOFILL_PR_VISA}
 };
 
-// Returns the type of this card according to the basic card payment spec. Will
-// return "generic" for unrecognized card type.
-const char* ConvertToBasicCardPaymentType(const std::string& type) {
-  for (size_t i = 0; i < arraysize(kBasicCardPaymentTypes); ++i) {
-    if (type == kBasicCardPaymentTypes[i].card_type)
-      return kBasicCardPaymentTypes[i].basic_card_payment_type;
+// Converts the card type into PaymentRequest type according to the basic card
+// payment spec and an icon. Will set the type and the icon to "generic" for
+// unrecognized card type.
+const PaymentRequestData* GetPaymentRequestData(const std::string& type) {
+  for (size_t i = 0; i < arraysize(kPaymentRequestData); ++i) {
+    if (type == kPaymentRequestData[i].card_type)
+      return &kPaymentRequestData[i];
   }
-  return kBasicCardPaymentTypes[0].basic_card_payment_type;
+  return &kPaymentRequestData[0];
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
     JNIEnv* env,
     const CreditCard& card) {
+  const PaymentRequestData* payment_request_data =
+      GetPaymentRequestData(card.type());
   return Java_CreditCard_create(
       env, ConvertUTF8ToJavaString(env, card.guid()).obj(),
       ConvertUTF8ToJavaString(env, card.origin()).obj(),
       card.record_type() == CreditCard::LOCAL_CARD,
       card.record_type() == CreditCard::FULL_SERVER_CARD,
       ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME_FULL))
           .obj(),
       ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NUMBER)).obj(),
       ConvertUTF16ToJavaString(env, card.TypeAndLastFourDigits()).obj(),
       ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
           .obj(),
       ConvertUTF16ToJavaString(env,
                                card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR))
           .obj(),
-      ConvertUTF8ToJavaString(env, ConvertToBasicCardPaymentType(card.type()))
+      ConvertUTF8ToJavaString(env,
+                              payment_request_data->basic_card_payment_type)
           .obj(),
       ResourceMapper::MapFromChromiumId(
-          CreditCard::IconResourceId(card.type())));
+          payment_request_data->icon_resource_id));
 }
 
 void PopulateNativeCreditCardFromJava(
     const jobject& jcard,
     JNIEnv* env,
     CreditCard* card) {
   card->set_origin(
       ConvertJavaStringToUTF8(Java_CreditCard_getOrigin(env, jcard)));
   card->SetRawInfo(
       CREDIT_CARD_NAME_FULL,
@@ skipping 287 matching lines @@
                base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill