[rAc] Move email address into billing address section.

chrome/browser/ui/autofill/autofill_dialog_common.cc

 // Copyright 2013 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/autofill/autofill_dialog_common.h"
 
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "grit/chromium_strings.h"
 #include "grit/component_strings.h"
@@ skipping 54 matching lines @@
                  DetailInputs* inputs) {
   for (size_t i = 0; i < template_size; ++i) {
     const DetailInput* input = &input_template[i];
     inputs->push_back(*input);
   }
 }
 
 // Constructs |inputs| from template data for a given |dialog_section|.
 void BuildInputsForSection(DialogSection dialog_section,
                            DetailInputs* inputs) {
-  const DetailInput kEmailInputs[] = {
-    { 1, EMAIL_ADDRESS, IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL },
-  };
-
   const DetailInput kCCInputs[] = {
-    { 2, CREDIT_CARD_NUMBER, IDS_AUTOFILL_DIALOG_PLACEHOLDER_CARD_NUMBER },
-    { 3, CREDIT_CARD_EXP_MONTH, IDS_AUTOFILL_DIALOG_PLACEHOLDER_EXPIRY_MONTH },
-    { 3, CREDIT_CARD_EXP_4_DIGIT_YEAR,
+    { 1, CREDIT_CARD_NUMBER, IDS_AUTOFILL_DIALOG_PLACEHOLDER_CARD_NUMBER },
+    { 2, CREDIT_CARD_EXP_MONTH, IDS_AUTOFILL_DIALOG_PLACEHOLDER_EXPIRY_MONTH },
+    { 2, CREDIT_CARD_EXP_4_DIGIT_YEAR,
       IDS_AUTOFILL_DIALOG_PLACEHOLDER_EXPIRY_YEAR },
-    { 3, CREDIT_CARD_VERIFICATION_CODE, IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC,
+    { 2, CREDIT_CARD_VERIFICATION_CODE, IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC,
       1.5 },
   };
 
   const DetailInput kBillingInputs[] = {
-    { 4, NAME_BILLING_FULL, IDS_AUTOFILL_DIALOG_PLACEHOLDER_CARDHOLDER_NAME },
-    { 5, ADDRESS_BILLING_LINE1,
+    { 3, NAME_BILLING_FULL, IDS_AUTOFILL_DIALOG_PLACEHOLDER_CARDHOLDER_NAME },
+    { 4, ADDRESS_BILLING_LINE1,
       IDS_AUTOFILL_DIALOG_PLACEHOLDER_ADDRESS_LINE_1 },
-    { 6, ADDRESS_BILLING_LINE2,
+    { 5, ADDRESS_BILLING_LINE2,
       IDS_AUTOFILL_DIALOG_PLACEHOLDER_ADDRESS_LINE_2 },
-    { 7, ADDRESS_BILLING_CITY,
+    { 6, ADDRESS_BILLING_CITY,
       IDS_AUTOFILL_DIALOG_PLACEHOLDER_LOCALITY },
     // TODO(estade): state placeholder should depend on locale.
-    { 8, ADDRESS_BILLING_STATE, IDS_AUTOFILL_FIELD_LABEL_STATE },
-    { 8, ADDRESS_BILLING_ZIP,
+    { 7, ADDRESS_BILLING_STATE, IDS_AUTOFILL_FIELD_LABEL_STATE },
+    { 7, ADDRESS_BILLING_ZIP,
       IDS_AUTOFILL_DIALOG_PLACEHOLDER_POSTAL_CODE },
     // We don't allow the user to change the country: http://crbug.com/247518
     { -1, ADDRESS_BILLING_COUNTRY, 0 },
-    { 10, PHONE_BILLING_WHOLE_NUMBER,
+    { 9, PHONE_BILLING_WHOLE_NUMBER,
       IDS_AUTOFILL_DIALOG_PLACEHOLDER_PHONE_NUMBER },
+    { 10, EMAIL_ADDRESS, IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL },
   };
 
   const DetailInput kShippingInputs[] = {
     { 11, NAME_FULL, IDS_AUTOFILL_DIALOG_PLACEHOLDER_ADDRESSEE_NAME },
     { 12, ADDRESS_HOME_LINE1, IDS_AUTOFILL_DIALOG_PLACEHOLDER_ADDRESS_LINE_1 },
     { 13, ADDRESS_HOME_LINE2, IDS_AUTOFILL_DIALOG_PLACEHOLDER_ADDRESS_LINE_2 },
     { 14, ADDRESS_HOME_CITY, IDS_AUTOFILL_DIALOG_PLACEHOLDER_LOCALITY },
     { 15, ADDRESS_HOME_STATE, IDS_AUTOFILL_FIELD_LABEL_STATE },
     { 15, ADDRESS_HOME_ZIP, IDS_AUTOFILL_DIALOG_PLACEHOLDER_POSTAL_CODE },
     { -1, ADDRESS_HOME_COUNTRY, 0 },
     { 17, PHONE_HOME_WHOLE_NUMBER,
       IDS_AUTOFILL_DIALOG_PLACEHOLDER_PHONE_NUMBER },
   };
 
   switch (dialog_section) {
-    case SECTION_EMAIL:
-      BuildInputs(kEmailInputs,
-                  arraysize(kEmailInputs),
-                  inputs);
-      break;
-
     case SECTION_CC:
       BuildInputs(kCCInputs,
                   arraysize(kCCInputs),
                   inputs);
       break;
 
     case SECTION_BILLING:
       BuildInputs(kBillingInputs,
                   arraysize(kBillingInputs),
                   inputs);
       break;
 
     case SECTION_CC_BILLING:
       BuildInputs(kCCInputs,
                   arraysize(kCCInputs),
                   inputs);
       BuildInputs(kBillingInputs,
-                  arraysize(kBillingInputs),
+                  arraysize(kBillingInputs) - 1,  // Skip the email field.

[Evan Stade, 2013/09/05 16:54:09]

hmmm, maybe it would be cleaner to add the email in the SECTION_BILLING case
rather than removing it in the CC_BILLING case

[Ilya Sherman, 2013/09/06 04:16:05]

Done.

                   inputs);
       break;
 
     case SECTION_SHIPPING:
       BuildInputs(kShippingInputs,
                   arraysize(kShippingInputs),
                   inputs);
       break;
   }
 }
 
 AutofillMetrics::DialogUiEvent DialogSectionToUiEditEvent(
     DialogSection section) {
   switch (section) {
-    case SECTION_EMAIL:
-      return AutofillMetrics::DIALOG_UI_EMAIL_EDIT_UI_SHOWN;
-
     case SECTION_BILLING:
       return AutofillMetrics::DIALOG_UI_BILLING_EDIT_UI_SHOWN;
 
     case SECTION_CC_BILLING:
       return AutofillMetrics::DIALOG_UI_CC_BILLING_EDIT_UI_SHOWN;
 
     case SECTION_SHIPPING:
       return AutofillMetrics::DIALOG_UI_SHIPPING_EDIT_UI_SHOWN;
 
     case SECTION_CC:
       return AutofillMetrics::DIALOG_UI_CC_EDIT_UI_SHOWN;
   }
 
   NOTREACHED();
   return AutofillMetrics::NUM_DIALOG_UI_EVENTS;
 }
 
 AutofillMetrics::DialogUiEvent DialogSectionToUiItemAddedEvent(
     DialogSection section) {
   switch (section) {
-    case SECTION_EMAIL:
-      return AutofillMetrics::DIALOG_UI_EMAIL_ITEM_ADDED;
-
     case SECTION_BILLING:
       return AutofillMetrics::DIALOG_UI_BILLING_ITEM_ADDED;
 
     case SECTION_CC_BILLING:
       return AutofillMetrics::DIALOG_UI_CC_BILLING_ITEM_ADDED;
 
     case SECTION_SHIPPING:
       return AutofillMetrics::DIALOG_UI_SHIPPING_ITEM_ADDED;
 
     case SECTION_CC:
       return AutofillMetrics::DIALOG_UI_CC_ITEM_ADDED;
   }
 
   NOTREACHED();
   return AutofillMetrics::NUM_DIALOG_UI_EVENTS;
 }
 
 AutofillMetrics::DialogUiEvent DialogSectionToUiSelectionChangedEvent(
     DialogSection section) {
   switch (section) {
-    case SECTION_EMAIL:
-      return AutofillMetrics::DIALOG_UI_EMAIL_SELECTED_SUGGESTION_CHANGED;
-
     case SECTION_BILLING:
       return AutofillMetrics::DIALOG_UI_BILLING_SELECTED_SUGGESTION_CHANGED;
 
     case SECTION_CC_BILLING:
       return AutofillMetrics::DIALOG_UI_CC_BILLING_SELECTED_SUGGESTION_CHANGED;
 
     case SECTION_SHIPPING:
       return AutofillMetrics::DIALOG_UI_SHIPPING_SELECTED_SUGGESTION_CHANGED;
 
     case SECTION_CC:
       return AutofillMetrics::DIALOG_UI_CC_SELECTED_SUGGESTION_CHANGED;
   }
 
   NOTREACHED();
   return AutofillMetrics::NUM_DIALOG_UI_EVENTS;
 }
 
 }  // namespace common
 }  // namespace autofill