requestAutocomplete - more elaborate suggestion labels

chrome/browser/ui/webui/options/autofill_options_handler.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 "chrome/browser/ui/webui/options/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
-#include "grit/webkit_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/webui/web_ui_util.h"
 
 namespace {
 
-// Converts a credit card type to the appropriate resource ID of the CC icon.
-int CreditCardTypeToResourceID(const std::string& type) {
-  if (type == kAmericanExpressCard)
-    return IDR_AUTOFILL_CC_AMEX;
-  else if (type == kDinersCard)
-    return IDR_AUTOFILL_CC_DINERS;
-  else if (type == kDiscoverCard)
-    return IDR_AUTOFILL_CC_DISCOVER;
-  else if (type == kGenericCard)
-    return IDR_AUTOFILL_CC_GENERIC;
-  else if (type == kJCBCard)
-    return IDR_AUTOFILL_CC_JCB;
-  else if (type == kMasterCard)
-    return IDR_AUTOFILL_CC_MASTERCARD;
-  else if (type == kSoloCard)
-    return IDR_AUTOFILL_CC_SOLO;
-  else if (type == kVisaCard)
-    return IDR_AUTOFILL_CC_VISA;
-
-  NOTREACHED();
-  return 0;
-}
-
-// Converts a credit card type to the appropriate localized card type.
-string16 LocalizedCreditCardType(const std::string& type) {
-  if (type == kAmericanExpressCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_AMEX);
-  else if (type == kDinersCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DINERS);
-  else if (type == kDiscoverCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DISCOVER);
-  else if (type == kGenericCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_GENERIC);
-  else if (type == kJCBCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_JCB);
-  else if (type == kMasterCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_MASTERCARD);
-  else if (type == kSoloCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_SOLO);
-  else if (type == kVisaCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_VISA);
-
-  NOTREACHED();
-  return string16();
-}
-
 // Returns a dictionary that maps country codes to data for the country.
 DictionaryValue* GetCountryData() {
   std::string app_locale = AutofillCountry::ApplicationLocale();
   std::vector<std::string> country_codes;
   AutofillCountry::GetAvailableCountries(&country_codes);
 
   DictionaryValue* country_data = new DictionaryValue();
   for (size_t i = 0; i < country_codes.size(); ++i) {
     const AutofillCountry country(country_codes[i], app_locale);
 
@@ skipping 326 matching lines @@
     entry->Append(new StringValue((*i)->Label()));
     addresses.Append(entry);
   }
 
   web_ui()->CallJavascriptFunction("AutofillOptions.setAddressList", addresses);
 
   ListValue credit_cards;
   for (std::vector<CreditCard*>::const_iterator i =
            personal_data_->credit_cards().begin();
        i != personal_data_->credit_cards().end(); ++i) {
+    const CreditCard* card = *i;
+    // TODO(estade): this should be a dictionary.
     ListValue* entry = new ListValue();
-    entry->Append(new StringValue((*i)->guid()));
-    entry->Append(new StringValue((*i)->Label()));
-    int res = CreditCardTypeToResourceID((*i)->type());
-    entry->Append(
-        new StringValue(webui::GetBitmapDataUrlFromResource(res)));
-    entry->Append(new StringValue(LocalizedCreditCardType((*i)->type())));
+    entry->Append(new StringValue(card->guid()));
+    entry->Append(new StringValue(card->Label()));
+    entry->Append(new StringValue(
+        webui::GetBitmapDataUrlFromResource(card->IconResourceId())));
+    entry->Append(new StringValue(card->TypeForDisplay()));
     credit_cards.Append(entry);
   }
 
   web_ui()->CallJavascriptFunction("AutofillOptions.setCreditCardList",
                                    credit_cards);
 }
 
 void AutofillOptionsHandler::RemoveData(const ListValue* args) {
   DCHECK(IsPersonalDataLoaded());
 
@@ skipping 174 matching lines @@
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
 }  // namespace options