Reduce boxing and unboxing of AutofillFieldType

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 248 matching lines @@
     // There is a race where a user can click once on the close button and
     // quickly click again on the list item before the item is removed (since
     // the list is not updated until the model tells the list an item has been
     // removed). This will activate the editor for a profile that has been
     // removed. Do nothing in that case.
     return;
   }
 
   DictionaryValue address;
   address.SetString("guid", profile->guid());
   address.SetString("fullName",

[dhollowa, 2011/03/16 17:07:11]

nit: A number of these should fit on single line now.

[Ilya Sherman, 2011/03/17 03:42:29]

Done.

-                    profile->GetFieldText(AutofillType(NAME_FULL)));
+                    profile->GetFieldText(NAME_FULL));
   address.SetString("companyName",
-                    profile->GetFieldText(AutofillType(COMPANY_NAME)));
+                    profile->GetFieldText(COMPANY_NAME));
   address.SetString("addrLine1",
-                    profile->GetFieldText(AutofillType(ADDRESS_HOME_LINE1)));
+                    profile->GetFieldText(ADDRESS_HOME_LINE1));
   address.SetString("addrLine2",
-                    profile->GetFieldText(AutofillType(ADDRESS_HOME_LINE2)));
+                    profile->GetFieldText(ADDRESS_HOME_LINE2));
   address.SetString("city",
-                    profile->GetFieldText(AutofillType(ADDRESS_HOME_CITY)));
+                    profile->GetFieldText(ADDRESS_HOME_CITY));
   address.SetString("state",
-                    profile->GetFieldText(AutofillType(ADDRESS_HOME_STATE)));
+                    profile->GetFieldText(ADDRESS_HOME_STATE));
   address.SetString("postalCode",
-                    profile->GetFieldText(AutofillType(ADDRESS_HOME_ZIP)));
+                    profile->GetFieldText(ADDRESS_HOME_ZIP));
   address.SetString("country",
                     profile->CountryCode());
   address.SetString(
       "phone",
-      profile->GetFieldText(AutofillType(PHONE_HOME_WHOLE_NUMBER)));
+      profile->GetFieldText(PHONE_HOME_WHOLE_NUMBER));
   address.SetString(
       "fax",
-      profile->GetFieldText(AutofillType(PHONE_FAX_WHOLE_NUMBER)));
+      profile->GetFieldText(PHONE_FAX_WHOLE_NUMBER));
   address.SetString("email",
-                     profile->GetFieldText(AutofillType(EMAIL_ADDRESS)));
+                     profile->GetFieldText(EMAIL_ADDRESS));
 
   web_ui_->CallJavascriptFunction("AutoFillOptions.editAddress", address);
 }
 
 void AutoFillOptionsHandler::LoadCreditCardEditor(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   CreditCard* credit_card = personal_data_->GetCreditCardByGUID(guid);
   if (!credit_card) {
     // There is a race where a user can click once on the close button and
     // quickly click again on the list item before the item is removed (since
     // the list is not updated until the model tells the list an item has been
     // removed). This will activate the editor for a profile that has been
     // removed. Do nothing in that case.
     return;
   }
 
   DictionaryValue credit_card_data;
   credit_card_data.SetString("guid", credit_card->guid());
   credit_card_data.SetString(
       "nameOnCard",
-      credit_card->GetFieldText(AutofillType(CREDIT_CARD_NAME)));
+      credit_card->GetFieldText(CREDIT_CARD_NAME));
   credit_card_data.SetString(
       "creditCardNumber",
-      credit_card->GetFieldText(AutofillType(CREDIT_CARD_NUMBER)));
+      credit_card->GetFieldText(CREDIT_CARD_NUMBER));
   credit_card_data.SetString(
       "expirationMonth",
-      credit_card->GetFieldText(AutofillType(CREDIT_CARD_EXP_MONTH)));
+      credit_card->GetFieldText(CREDIT_CARD_EXP_MONTH));
   credit_card_data.SetString(
       "expirationYear",
-      credit_card->GetFieldText(AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR)));
+      credit_card->GetFieldText(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 
   web_ui_->CallJavascriptFunction("AutoFillOptions.editCreditCard",
                                   credit_card_data);
 }
 
 void AutoFillOptionsHandler::SetAddress(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
     return;
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   AutofillProfile profile(guid);
 
   std::string country_code;
   string16 value;
   if (args->GetString(1, &value))
-    profile.SetInfo(AutofillType(NAME_FULL), value);
+    profile.SetInfo(NAME_FULL, value);
   if (args->GetString(2, &value))
-    profile.SetInfo(AutofillType(COMPANY_NAME), value);
+    profile.SetInfo(COMPANY_NAME, value);
   if (args->GetString(3, &value))
-    profile.SetInfo(AutofillType(ADDRESS_HOME_LINE1), value);
+    profile.SetInfo(ADDRESS_HOME_LINE1, value);
   if (args->GetString(4, &value))
-    profile.SetInfo(AutofillType(ADDRESS_HOME_LINE2), value);
+    profile.SetInfo(ADDRESS_HOME_LINE2, value);
   if (args->GetString(5, &value))
-    profile.SetInfo(AutofillType(ADDRESS_HOME_CITY), value);
+    profile.SetInfo(ADDRESS_HOME_CITY, value);
   if (args->GetString(6, &value))
-    profile.SetInfo(AutofillType(ADDRESS_HOME_STATE), value);
+    profile.SetInfo(ADDRESS_HOME_STATE, value);
   if (args->GetString(7, &value))
-    profile.SetInfo(AutofillType(ADDRESS_HOME_ZIP), value);
+    profile.SetInfo(ADDRESS_HOME_ZIP, value);
   if (args->GetString(8, &country_code))
     profile.SetCountryCode(country_code);
   if (args->GetString(9, &value))
-    profile.SetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER), value);
+    profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, value);
   if (args->GetString(10, &value))
-    profile.SetInfo(AutofillType(PHONE_FAX_WHOLE_NUMBER), value);
+    profile.SetInfo(PHONE_FAX_WHOLE_NUMBER, value);
   if (args->GetString(11, &value))
-    profile.SetInfo(AutofillType(EMAIL_ADDRESS), value);
+    profile.SetInfo(EMAIL_ADDRESS, value);
 
   if (!guid::IsValidGUID(profile.guid())) {
     profile.set_guid(guid::GenerateGUID());
     personal_data_->AddProfile(profile);
   } else {
     personal_data_->UpdateProfile(profile);
   }
 }
 
 void AutoFillOptionsHandler::SetCreditCard(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
     return;
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   CreditCard credit_card(guid);
 
   string16 value;
   if (args->GetString(1, &value))
-    credit_card.SetInfo(AutofillType(CREDIT_CARD_NAME), value);
+    credit_card.SetInfo(CREDIT_CARD_NAME, value);
   if (args->GetString(2, &value))
-    credit_card.SetInfo(AutofillType(CREDIT_CARD_NUMBER), value);
+    credit_card.SetInfo(CREDIT_CARD_NUMBER, value);
   if (args->GetString(3, &value))
-    credit_card.SetInfo(AutofillType(CREDIT_CARD_EXP_MONTH), value);
+    credit_card.SetInfo(CREDIT_CARD_EXP_MONTH, value);
   if (args->GetString(4, &value))
-    credit_card.SetInfo(AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), value);
+    credit_card.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, value);
 
   if (!guid::IsValidGUID(credit_card.guid())) {
     credit_card.set_guid(guid::GenerateGUID());
     personal_data_->AddCreditCard(credit_card);
   } else {
     personal_data_->UpdateCreditCard(credit_card);
   }
 }