Autofill: Remove fax number completely.

chrome/browser/ui/webui/options/autofill_options_handler.cc

 // Copyright (c) 2011 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/logging.h"
 #include "base/string16.h"
@@ skipping 99 matching lines @@
                   AutofillProfile* profile) {
   std::vector<string16> values(list->GetSize());
   for (size_t i = 0; i < list->GetSize(); ++i) {
     string16 value;
     if (list->GetString(i, &value))
       values[i] = value;
   }
   profile->SetMultiInfo(type, values);
 }
 
-// Pulls the phone (or fax) number |index|, |phone_number_list|, and
-// |country_code| from the |args| input.
+// Pulls the phone number |index|, |phone_number_list|, and |country_code| from
+// the |args| input.
 void ExtractPhoneNumberInformation(const ListValue* args,
                                    size_t* index,
                                    ListValue** phone_number_list,
                                    std::string* country_code) {
   // Retrieve index as a |double|, as that is how it comes across from
   // JavaScript.
   double number = 0.0;
   if (!args->GetDouble(0, &number)) {
     NOTREACHED();
     return;
@@ skipping 114 matching lines @@
       NewCallback(this, &AutofillOptionsHandler::LoadCreditCardEditor));
   web_ui_->RegisterMessageCallback(
       "setAddress",
       NewCallback(this, &AutofillOptionsHandler::SetAddress));
   web_ui_->RegisterMessageCallback(
       "setCreditCard",
       NewCallback(this, &AutofillOptionsHandler::SetCreditCard));
   web_ui_->RegisterMessageCallback(
       "validatePhoneNumbers",
       NewCallback(this, &AutofillOptionsHandler::ValidatePhoneNumbers));
-  web_ui_->RegisterMessageCallback(
-      "validateFaxNumbers",
-      NewCallback(this, &AutofillOptionsHandler::ValidateFaxNumbers));
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // PersonalDataManagerObserver implementation:
 void AutofillOptionsHandler::OnPersonalDataChanged() {
   LoadAutofillData();
 }
 
 void AutofillOptionsHandler::SetAddressOverlayStrings(
     DictionaryValue* localized_strings) {
   localized_strings->SetString("autofillEditAddressTitle",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_EDIT_ADDRESS_CAPTION));
   localized_strings->SetString("fullNameLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_FULL_NAME));
   localized_strings->SetString("companyNameLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_COMPANY_NAME));
   localized_strings->SetString("addrLine1Label",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADDRESS_LINE_1));
   localized_strings->SetString("addrLine2Label",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADDRESS_LINE_2));
   localized_strings->SetString("cityLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_CITY));
   localized_strings->SetString("countryLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_COUNTRY));
   localized_strings->SetString("phoneLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PHONE));
-  localized_strings->SetString("faxLabel",
-      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_FAX));
   localized_strings->SetString("emailLabel",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_EMAIL));
   localized_strings->SetString("addNewNamePlaceholder",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_NEW_NAME));
   localized_strings->SetString("addNewPhonePlaceholder",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_NEW_PHONE));
-  localized_strings->SetString("addNewFaxPlaceholder",
-      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_NEW_FAX));
   localized_strings->SetString("addNewEmailPlaceholder",
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_NEW_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());
 }
 
@@ skipping 93 matching lines @@
   address.Set("fullName", list.release());
   address.SetString("companyName", profile->GetInfo(COMPANY_NAME));
   address.SetString("addrLine1", profile->GetInfo(ADDRESS_HOME_LINE1));
   address.SetString("addrLine2", profile->GetInfo(ADDRESS_HOME_LINE2));
   address.SetString("city", profile->GetInfo(ADDRESS_HOME_CITY));
   address.SetString("state", profile->GetInfo(ADDRESS_HOME_STATE));
   address.SetString("postalCode", profile->GetInfo(ADDRESS_HOME_ZIP));
   address.SetString("country", profile->CountryCode());
   GetValueList(*profile, PHONE_HOME_WHOLE_NUMBER, &list);
   address.Set("phone", list.release());
-  GetValueList(*profile, PHONE_FAX_WHOLE_NUMBER, &list);
-  address.Set("fax", list.release());
   GetValueList(*profile, EMAIL_ADDRESS, &list);
   address.Set("email", list.release());
 
   web_ui_->CallJavascriptFunction("AutofillOptions.editAddress", address);
 }
 
 void AutofillOptionsHandler::LoadCreditCardEditor(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
@@ skipping 55 matching lines @@
     profile.SetInfo(ADDRESS_HOME_CITY, value);
   if (args->GetString(6, &value))
     profile.SetInfo(ADDRESS_HOME_STATE, value);
   if (args->GetString(7, &value))
     profile.SetInfo(ADDRESS_HOME_ZIP, value);
   if (args->GetString(8, &country_code))
     profile.SetCountryCode(country_code);
   if (args->GetList(9, &list_value))
     SetValueList(list_value, PHONE_HOME_WHOLE_NUMBER, &profile);
   if (args->GetList(10, &list_value))
-    SetValueList(list_value, PHONE_FAX_WHOLE_NUMBER, &profile);
-  if (args->GetList(11, &list_value))
     SetValueList(list_value, EMAIL_ADDRESS, &profile);
 
   if (!guid::IsValidGUID(profile.guid())) {
     profile.set_guid(guid::GenerateGUID());
     personal_data_->AddProfile(profile);
   } else {
     personal_data_->UpdateProfile(profile);
   }
 }
 
@@ skipping 30 matching lines @@
 void AutofillOptionsHandler::ValidatePhoneNumbers(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
     return;
 
   ListValue* list_value = NULL;
   ValidatePhoneArguments(args, &list_value);
 
   web_ui_->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
-
-void AutofillOptionsHandler::ValidateFaxNumbers(const ListValue* args) {
-  if (!personal_data_->IsDataLoaded())
-    return;
-
-  ListValue* list_value = NULL;
-  ValidatePhoneArguments(args, &list_value);
-
-  web_ui_->CallJavascriptFunction(
-      "AutofillEditAddressOverlay.setValidatedFaxNumbers", *list_value);
-}