Reduce boxing and unboxing of AutofillFieldType

chrome/browser/autofill/autofill_editor_gtk.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/autofill/autofill_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 19 matching lines @@
 GtkWidget* CreateLabel(int label_id) {
   GtkWidget* label = gtk_label_new(l10n_util::GetStringUTF8(label_id).c_str());
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
   return label;
 }
 
 // Sets the text of |entry| to the value of the field |type| from |profile|.
 void SetEntryText(GtkWidget* entry, FormGroup* profile, _FieldType type) {
   gtk_entry_set_text(
       GTK_ENTRY(entry),
-      UTF16ToUTF8(profile->GetFieldText(AutofillType(type))).c_str());
+      UTF16ToUTF8(profile->GetFieldText(type)).c_str());
 }
 
 // Returns the current value of |entry|.
 string16 GetEntryText(GtkWidget* entry) {
   return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(entry)));
 }
 
 // Sets |form|'s field of type |type| to the text in |entry|.
 void SetFormValue(GtkWidget* entry, FormGroup* form, _FieldType type) {
-  form->SetInfo(AutofillType(type), GetEntryText(entry));
+  form->SetInfo(type, GetEntryText(entry));
 }
 
 // Sets the number of characters to display in |combobox| to |width|.
 void SetComboBoxCellRendererCharWidth(GtkWidget* combobox, int width) {
   GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(combobox));
   DCHECK(g_list_length(cells) > 0);
   GtkCellRendererText* renderer =
       GTK_CELL_RENDERER_TEXT(g_list_first(cells)->data);
   g_object_set(G_OBJECT(renderer), "width-chars", width, NULL);
   g_list_free(cells);
@@ skipping 360 matching lines @@
   SetFormValue(address_2_, profile, ADDRESS_HOME_LINE2);
   SetFormValue(city_, profile, ADDRESS_HOME_CITY);
   SetFormValue(state_, profile, ADDRESS_HOME_STATE);
   SetFormValue(zip_, profile, ADDRESS_HOME_ZIP);
   SetFormValue(country_, profile, ADDRESS_HOME_COUNTRY);
   SetFormValue(email_, profile, EMAIL_ADDRESS);
 
   string16 number, city_code, country_code;
   PhoneNumber::ParsePhoneNumber(
       GetEntryText(phone_), &number, &city_code, &country_code);
-  profile->SetInfo(AutofillType(PHONE_HOME_COUNTRY_CODE), country_code);
-  profile->SetInfo(AutofillType(PHONE_HOME_CITY_CODE), city_code);
-  profile->SetInfo(AutofillType(PHONE_HOME_NUMBER), number);
+  profile->SetInfo(PHONE_HOME_COUNTRY_CODE, country_code);
+  profile->SetInfo(PHONE_HOME_CITY_CODE, city_code);
+  profile->SetInfo(PHONE_HOME_NUMBER, number);
 
   PhoneNumber::ParsePhoneNumber(
       GetEntryText(fax_), &number, &city_code, &country_code);
-  profile->SetInfo(AutofillType(PHONE_FAX_COUNTRY_CODE), country_code);
-  profile->SetInfo(AutofillType(PHONE_FAX_CITY_CODE), city_code);
-  profile->SetInfo(AutofillType(PHONE_FAX_NUMBER), number);
+  profile->SetInfo(PHONE_FAX_COUNTRY_CODE, country_code);
+  profile->SetInfo(PHONE_FAX_CITY_CODE, city_code);
+  profile->SetInfo(PHONE_FAX_NUMBER, number);
 }
 
 void AutofillProfileEditor::UpdatePhoneImage(GtkWidget* entry,
                                              GtkWidget* image) {
   string16 number, city_code, country_code;
   string16 text(GetEntryText(entry));
   if (text.empty()) {
     gtk_image_set_from_pixbuf(GTK_IMAGE(image), NULL);
   } else if (PhoneNumber::ParsePhoneNumber(text, &number, &city_code,
                                            &country_code)) {
@@ skipping 256 matching lines @@
                    G_CALLBACK(OnInsertTextIntoNumberThunk), this);
 }
 
 void AutoFillCreditCardEditor::SetWidgetValues(CreditCard* card) {
   SetEntryText(name_, card, CREDIT_CARD_NAME);
 
   gtk_entry_set_text(GTK_ENTRY(number_),
                      UTF16ToUTF8(card->ObfuscatedNumber()).c_str());
 
   int month;
-  base::StringToInt(card->GetFieldText(AutofillType(CREDIT_CARD_EXP_MONTH)),
+  base::StringToInt(card->GetFieldText(CREDIT_CARD_EXP_MONTH),
                     &month);
   if (month >= 1 && month <= 12) {
     gtk_combo_box_set_active(GTK_COMBO_BOX(month_), month - 1);
   } else {
     gtk_combo_box_set_active(GTK_COMBO_BOX(month_), 0);
   }
 
   int year;
   if (!base::StringToInt(
-          card->GetFieldText(AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR)),
+          card->GetFieldText(CREDIT_CARD_EXP_4_DIGIT_YEAR),
           &year)) {
     NOTREACHED();
   }
   if (year >= base_year_ && year < base_year_ + kNumYears)
     gtk_combo_box_set_active(GTK_COMBO_BOX(year_), year - base_year_);
   else
     gtk_combo_box_set_active(GTK_COMBO_BOX(year_), 0);
 }
 
 void AutoFillCreditCardEditor::ApplyEdits() {
@@ skipping 37 matching lines @@
     CreditCard* card) {
   SetFormValue(name_, card, CREDIT_CARD_NAME);
 
   if (edited_number_)
     SetFormValue(number_, card, CREDIT_CARD_NUMBER);
 
   int selected_month_index =
       gtk_combo_box_get_active(GTK_COMBO_BOX(month_));
   if (selected_month_index == -1)
     selected_month_index = 0;
-  card->SetInfo(AutofillType(CREDIT_CARD_EXP_MONTH),
+  card->SetInfo(CREDIT_CARD_EXP_MONTH,
                 base::IntToString16(selected_month_index + 1));
 
   int selected_year_index =
       gtk_combo_box_get_active(GTK_COMBO_BOX(year_));
   if (selected_year_index == -1)
     selected_year_index = 0;
-  card->SetInfo(AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
+  card->SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR,
                 base::IntToString16(selected_year_index + base_year_));
 }
 
 void AutoFillCreditCardEditor::UpdateOkButton() {
   // Enable the ok button if at least one field is non-empty and the phone
   // numbers are valid.
   bool valid = !GetEntryText(name_).empty() || !GetEntryText(number_).empty();
   gtk_widget_set_sensitive(ok_button_, valid);
 }
 
@@ skipping 64 matching lines @@
   new AutofillProfileEditor(observer, profile, auto_fill_profile);
 }
 
 void ShowAutoFillCreditCardEditor(gfx::NativeView parent,
                                   AutoFillDialogObserver* observer,
                                   Profile* profile,
                                   CreditCard* credit_card) {
   // AutoFillCreditCardEditor takes care of deleting itself.
   new AutoFillCreditCardEditor(observer, profile, credit_card);
 }