Reduce boxing and unboxing of AutofillFieldType

chrome/browser/ui/views/autofill_profiles_view_win.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/views/autofill_profiles_view_win.h"
 
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "base/message_loop.h"
@@ skipping 833 matching lines @@
 // AutofillProfilesView::EditableSetViewContents,
 // views::TextfieldController implementations:
 void AutofillProfilesView::EditableSetViewContents::ContentsChanged(
     views::Textfield* sender,  const string16& new_contents) {
   if (temporary_info_.is_address) {
     for (int field = 0; field < arraysize(address_fields_); ++field) {
       DCHECK(text_fields_[address_fields_[field].text_field]);
       if (text_fields_[address_fields_[field].text_field] == sender) {
         if (!UpdateContentsPhoneViews(address_fields_[field].text_field,
                                       sender, new_contents)) {
-          temporary_info_.address.SetInfo(
-              AutofillType(address_fields_[field].type), new_contents);
+          temporary_info_.address.SetInfo(address_fields_[field].type,
+                                          new_contents);
         }
         UpdateButtons();
         return;
       }
     }
   } else {
     for (int field = 0; field < arraysize(credit_card_fields_); ++field) {
       DCHECK(text_fields_[credit_card_fields_[field].text_field]);
       if (text_fields_[credit_card_fields_[field].text_field] == sender) {
         UpdateContentsPhoneViews(address_fields_[field].text_field,
                                  sender, new_contents);
-        temporary_info_.credit_card.SetInfo(
-            AutofillType(credit_card_fields_[field].type), new_contents);
+        temporary_info_.credit_card.SetInfo(credit_card_fields_[field].type,
+                                            new_contents);
         UpdateButtons();
         return;
       }
     }
   }
 }
 
 bool AutofillProfilesView::EditableSetViewContents::HandleKeyEvent(
     views::Textfield* sender, const views::KeyEvent& key_event) {
   if (sender == text_fields_[TEXT_CC_NUMBER] &&
       !has_credit_card_number_been_edited_) {
     // You cannot edit obfuscated number, you must retype it anew.
     sender->SetText(string16());
     has_credit_card_number_been_edited_ = true;
   }
   return false;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutofillProfilesView::EditableSetViewContents,
 // views::Combobox::Listener implementations:
 void AutofillProfilesView::EditableSetViewContents::ItemChanged(
     views::Combobox* combo_box, int prev_index, int new_index) {
   if (combo_box == combo_box_month_) {
     if (new_index == -1) {
       NOTREACHED();
     } else {
       temporary_info_.credit_card.SetInfo(
-          AutofillType(CREDIT_CARD_EXP_MONTH),
+          CREDIT_CARD_EXP_MONTH,
           UTF16ToWideHack(combo_box_model_month_->GetItemAt(new_index)));
     }
   } else if (combo_box == combo_box_year_) {
     if (new_index == -1) {
       NOTREACHED();
     } else {
       temporary_info_.credit_card.SetInfo(
-          AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
+          CREDIT_CARD_EXP_4_DIGIT_YEAR,
           UTF16ToWideHack(combo_box_model_year_->GetItemAt(new_index)));
     }
   } else {
     NOTREACHED();
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutofillProfilesView::EditableSetViewContents, private:
 void AutofillProfilesView::EditableSetViewContents::InitAddressFields(
     views::GridLayout* layout) {
   DCHECK(temporary_info_.is_address);
 
   for (int field = 0; field < arraysize(address_fields_); ++field) {
     DCHECK(!text_fields_[address_fields_[field].text_field]);
     text_fields_[address_fields_[field].text_field] =
         new views::Textfield(views::Textfield::STYLE_DEFAULT);
     text_fields_[address_fields_[field].text_field]->SetController(this);
     text_fields_[address_fields_[field].text_field]->SetText(
-        temporary_info_.address.GetFieldText(
-        AutofillType(address_fields_[field].type)));
+        temporary_info_.address.GetFieldText(address_fields_[field].type));
   }
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_FULL_NAME));
 
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_FULL_NAME]);
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
@@ skipping 93 matching lines @@
   combo_box_model_year_->set_cb_strings(&model_strings);
 
   for (int field = 0; field < arraysize(credit_card_fields_); ++field) {
     DCHECK(!text_fields_[credit_card_fields_[field].text_field]);
     text_fields_[credit_card_fields_[field].text_field] =
         new views::Textfield(views::Textfield::STYLE_DEFAULT);
     text_fields_[credit_card_fields_[field].text_field]->SetController(this);
     string16 field_text;
     if (credit_card_fields_[field].text_field == TEXT_CC_NUMBER) {
       field_text = temporary_info_.credit_card.GetFieldText(
-          AutofillType(credit_card_fields_[field].type));
+          credit_card_fields_[field].type);
       if (!field_text.empty())
         field_text = temporary_info_.credit_card.ObfuscatedNumber();
     } else {
       field_text = temporary_info_.credit_card.GetFieldText(
-          AutofillType(credit_card_fields_[field].type));
+          credit_card_fields_[field].type);
     }
     text_fields_[credit_card_fields_[field].text_field]->SetText(field_text);
   }
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_NAME_ON_CARD));
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_CC_NAME]);
 
   // Layout credit card info
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_ccnumber_cvc_);
   layout->AddView(
       CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_CREDIT_CARD_NUMBER));
   layout->StartRow(0, double_column_ccnumber_cvc_);
   // Number (20 chars), month(2 chars), year (4 chars), cvc (4 chars)
   text_fields_[TEXT_CC_NUMBER]->set_default_width_in_chars(20);
   layout->AddView(text_fields_[TEXT_CC_NUMBER]);
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_ccexpiration_);
   layout->AddView(
       CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_EXPIRATION_DATE), 3, 1);
 
   combo_box_month_ = new views::Combobox(combo_box_model_month_.get());
   combo_box_month_->set_listener(this);
   string16 field_text;
-  field_text = temporary_info_.credit_card.GetFieldText(
-       AutofillType(CREDIT_CARD_EXP_MONTH));
+  field_text = temporary_info_.credit_card.GetFieldText(CREDIT_CARD_EXP_MONTH);
   combo_box_month_->SetSelectedItem(
       combo_box_model_month_->GetIndex(field_text));
 
   combo_box_year_ = new views::Combobox(combo_box_model_year_.get());
   combo_box_year_->set_listener(this);
   field_text = temporary_info_.credit_card.GetFieldText(
-      AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR));
+      CREDIT_CARD_EXP_4_DIGIT_YEAR);
   combo_box_year_->SetSelectedItem(combo_box_model_year_->GetIndex(field_text));
 
   layout->StartRow(0, double_column_ccexpiration_);
   layout->AddView(combo_box_month_);
   layout->AddView(combo_box_year_);
 
   UpdateButtons();
 }
 
 void AutofillProfilesView::EditableSetViewContents::InitLayoutGrid(
@@ skipping 94 matching lines @@
   switch (field) {
     case TEXT_PHONE_PHONE:
     case TEXT_FAX_PHONE: {
       for (std::vector<PhoneSubView*>::iterator it = phone_sub_views_.begin();
            it != phone_sub_views_.end(); ++it)
         (*it)->ContentsChanged(sender, new_contents);
       DCHECK(temporary_info_.is_address);  // Only addresses have phone numbers.
       string16 number, city, country;
       PhoneNumber::ParsePhoneNumber(new_contents, &number, &city, &country);
       temporary_info_.address.SetInfo(
-          AutofillType(field == TEXT_PHONE_PHONE ? PHONE_HOME_COUNTRY_CODE :
-                       PHONE_FAX_COUNTRY_CODE), country);
+          (field == TEXT_PHONE_PHONE ? PHONE_HOME_COUNTRY_CODE :

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

nit: Should be able to pull some of these ternaries to a same line now.

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

Just one of them

+           PHONE_FAX_COUNTRY_CODE),
+          country);
       temporary_info_.address.SetInfo(
-          AutofillType(field == TEXT_PHONE_PHONE ? PHONE_HOME_CITY_CODE :
-                       PHONE_FAX_CITY_CODE), city);
+          (field == TEXT_PHONE_PHONE ? PHONE_HOME_CITY_CODE :
+           PHONE_FAX_CITY_CODE),
+          city);
       temporary_info_.address.SetInfo(
-          AutofillType(field == TEXT_PHONE_PHONE ? PHONE_HOME_NUMBER :
-                       PHONE_FAX_NUMBER), number);
+          (field == TEXT_PHONE_PHONE ? PHONE_HOME_NUMBER :
+           PHONE_FAX_NUMBER),
+          number);
       return true;
     }
   }
   return false;
 }
 
 void AutofillProfilesView::StringVectorComboboxModel::set_cb_strings(
     std::vector<std::wstring> *source) {
   cb_strings_.swap(*source);
 }
@@ skipping 100 matching lines @@
                         AutoFillDialogObserver* observer,
                         Profile* profile) {
   DCHECK(profile);
 
   PersonalDataManager* personal_data_manager =
       profile->GetPersonalDataManager();
   DCHECK(personal_data_manager);
   AutofillProfilesView::Show(parent, observer, personal_data_manager, profile,
                              profile->GetPrefs(), NULL, NULL);
 }