set a default country in the autofill dialog.

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
+// Use of this soutaxrce code is governed by a BSD-style license that can be

[Ilya Sherman, 2013/02/26 09:57:07]

nit: soutaxrce, huh? ;)

[Evan Stade, 2013/02/26 19:01:40]

Done.

 // 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/strings/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 "ui/base/l10n/l10n_util.h"
 #include "ui/webui/web_ui_util.h"
 
 namespace {
 
-// 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);
-
-    DictionaryValue* details = new DictionaryValue();
-    details->SetString("name", country.name());
-    details->SetString("postalCodeLabel", country.postal_code_label());
-    details->SetString("stateLabel", country.state_label());
-
-    country_data->Set(country.country_code(), details);
-  }
-
-  return country_data;
-}
-
 // Get the multi-valued element for |type| and return it in |ListValue| form.
 void GetValueList(const AutofillProfile& profile,
                   AutofillFieldType type,
                   scoped_ptr<ListValue>* list) {
   list->reset(new ListValue);
 
   std::vector<string16> values;
   profile.GetRawMultiInfo(type, &values);
 
   // |GetRawMultiInfo()| always returns at least one, potentially empty, item.
@@ skipping 265 matching lines @@
   localized_strings->SetString("autofillAddFirstNamePlaceholder",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_ADD_FIRST_NAME));
   localized_strings->SetString("autofillAddMiddleNamePlaceholder",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_ADD_MIDDLE_NAME));
   localized_strings->SetString("autofillAddLastNamePlaceholder",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_ADD_LAST_NAME));
   localized_strings->SetString("autofillAddPhonePlaceholder",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_ADD_PHONE));
   localized_strings->SetString("autofillAddEmailPlaceholder",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_ADD_EMAIL));
-
-  std::string app_locale = AutofillCountry::ApplicationLocale();
-  std::string default_country_code =
-      AutofillCountry::CountryCodeForLocale(app_locale);
-  localized_strings->SetString("defaultCountryCode", default_country_code);
-  localized_strings->Set("autofillCountryData", GetCountryData());
+  SetCountryData(localized_strings);
 }
 
 void AutofillOptionsHandler::SetCreditCardOverlayStrings(
     DictionaryValue* localized_strings) {
   localized_strings->SetString("autofillEditCreditCardTitle",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_EDIT_CREDITCARD_CAPTION));
   localized_strings->SetString("nameOnCardLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_NAME_ON_CARD));
   localized_strings->SetString("creditCardNumberLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_CREDIT_CARD_NUMBER));
   localized_strings->SetString("creditCardExpirationDateLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_EXPIRATION_DATE));
 }
 
+void AutofillOptionsHandler::SetCountryData(
+    DictionaryValue* localized_strings) {
+  std::string app_locale = AutofillCountry::ApplicationLocale();
+  std::string default_country_code =
+      AutofillCountry::CountryCodeForLocale(app_locale);
+  localized_strings->SetString("defaultCountryCode", default_country_code);
+
+  autofill::CountryComboboxModel model;
+  const std::vector<AutofillCountry*>& countries = model.countries();
+
+  // An ordered list of options to show in the <select>.
+  ListValue* country_list = new ListValue();

[Ilya Sherman, 2013/02/26 09:57:07]

nit: I'd prefer you use a scoped_ptr here, and release() it on line 265.  (Same
applies to the other new's in this function.)

[Evan Stade, 2013/02/26 19:01:40]

Done.

+  // A dictionary of postal code and state info, keyed on country code.
+  DictionaryValue* country_data = new DictionaryValue();
+  for (size_t i = 0; i < countries.size(); ++i) {
+    DictionaryValue* option_details = new DictionaryValue();
+    option_details->SetString("name", model.GetItemAt(i));
+    option_details->SetString(
+        "value",
+        countries[i] ? countries[i]->country_code() :
+                       model.GetItemAt(i).empty() ? "" : "separator");
+    country_list->Append(option_details);
+
+    if (!countries[i])
+      continue;
+
+    DictionaryValue* details = new DictionaryValue();
+    details->SetString("postalCodeLabel", countries[i]->postal_code_label());
+    details->SetString("stateLabel", countries[i]->state_label());
+
+    country_data->Set(countries[i]->country_code(), details);
+
+  }
+  localized_strings->Set("autofillCountrySelectList", country_list);
+  localized_strings->Set("autofillCountryData", country_data);
+}
+
 void AutofillOptionsHandler::LoadAutofillData() {
   if (!IsPersonalDataLoaded())
     return;
 
   ListValue addresses;
   for (std::vector<AutofillProfile*>::const_iterator i =
            personal_data_->web_profiles().begin();
        i != personal_data_->web_profiles().end(); ++i) {
     ListValue* entry = new ListValue();
     entry->Append(new StringValue((*i)->guid()));
@@ skipping 202 matching lines @@
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
 }  // namespace options