more localization in autofill dialog

BUG=none

Review URL: https://codereview.chromium.org/12210150

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182110 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/generated_resources.grd

@@ -11016,6 +11016,22 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>"
       <message name="IDS_AUTOFILL_DIALOG_AUTOCHECKOUT_PROGRESS_BAR" desc="Label for Autocheckout progres bar.">
         Auto-Checkout...
       </message>
+      <!-- Menu items in the requestAutocomplete dialog. -->
+      <message name="IDS_AUTOFILL_DIALOG_ADD_EMAIL_ADDRESS" desc="Menu item for adding a new email address in the autofill dialog.">
+        Add email address...
+      </message>
+      <message name="IDS_AUTOFILL_DIALOG_ADD_CREDIT_CARD" desc="Menu item for adding a new credit card in the autofill dialog.">
+        Add credit card...
+      </message>
+      <message name="IDS_AUTOFILL_DIALOG_ADD_BILLING_ADDRESS" desc="Menu item for adding a new billing address in the autofill dialog.">
+        Add billing address...
+      </message>
+      <message name="IDS_AUTOFILL_DIALOG_ADD_BILLING_DETAILS" desc="Menu item for adding new billing details (credit card + address) in the autofill dialog.">
+        Add billing details...
+      </message>
+      <message name="IDS_AUTOFILL_DIALOG_ADD_SHIPPING_ADDRESS" desc="Menu item for adding new shipping address in the autofill dialog.">
+        Add shipping address...
+      </message>
 
 
       <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">

chrome/browser/ui/autofill/autofill_dialog_controller.h

@@ -41,7 +41,6 @@ class AutofillDialogController {
   virtual string16 AccountChooserText() const = 0;
   virtual string16 EditSuggestionText() const = 0;
   virtual string16 UseBillingForShippingText() const = 0;
-  virtual string16 WalletOptionText() const = 0;
   virtual string16 CancelButtonText() const = 0;
   virtual string16 ConfirmButtonText() const = 0;
   virtual string16 CancelSignInText() const = 0;

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

@@ -253,11 +253,6 @@ string16 AutofillDialogControllerImpl::UseBillingForShippingText() const {
       IDS_AUTOFILL_DIALOG_USE_BILLING_FOR_SHIPPING);
 }
 
-string16 AutofillDialogControllerImpl::WalletOptionText() const {
-  // TODO(estade): real strings and l10n.
-  return string16(ASCIIToUTF16("I love lamp."));
-}
-
 string16 AutofillDialogControllerImpl::CancelButtonText() const {
   return l10n_util::GetStringUTF16(IDS_CANCEL);
 }
@@ -855,8 +850,6 @@ void AutofillDialogControllerImpl::GenerateSuggestionsModels() {
   for (size_t i = 0; i < cards.size(); ++i) {
     suggested_cc_.AddKeyedItem(cards[i]->guid(), cards[i]->Label());
   }
-  // TODO(estade): real strings and i18n.
-  suggested_cc_.AddKeyedItem("", ASCIIToUTF16("Enter new card"));
 
   const std::vector<AutofillProfile*>& profiles = manager->GetProfiles();
   const std::string app_locale = AutofillCountry::ApplicationLocale();
@@ -878,10 +871,18 @@ void AutofillDialogControllerImpl::GenerateSuggestionsModels() {
     suggested_shipping_.AddKeyedItem(profiles[i]->guid(), profiles[i]->Label());
   }
 
-  // TODO(estade): real strings and i18n.
-  suggested_billing_.AddKeyedItem("", ASCIIToUTF16("Enter new billing"));
-  suggested_email_.AddKeyedItem("", ASCIIToUTF16("Enter new email"));
-  suggested_shipping_.AddKeyedItem("", ASCIIToUTF16("Enter new shipping"));
+  suggested_email_.AddKeyedItem(
+      std::string(),
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_EMAIL_ADDRESS));
+  suggested_cc_.AddKeyedItem(
+      std::string(),
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_CREDIT_CARD));
+  suggested_billing_.AddKeyedItem(
+      std::string(),
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_BILLING_ADDRESS));
+  suggested_shipping_.AddKeyedItem(
+      std::string(),
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_SHIPPING_ADDRESS));
 }
 
 bool AutofillDialogControllerImpl::IsCompleteProfile(

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

@@ -70,7 +70,6 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
   virtual string16 AccountChooserText() const OVERRIDE;
   virtual string16 EditSuggestionText() const OVERRIDE;
   virtual string16 UseBillingForShippingText() const OVERRIDE;
-  virtual string16 WalletOptionText() const OVERRIDE;
   virtual string16 CancelButtonText() const OVERRIDE;
   virtual string16 ConfirmButtonText() const OVERRIDE;
   virtual string16 SaveLocallyText() const OVERRIDE;