[Payments] Have expiration date be on the same line in CC editor

chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc

 // Copyright 2017 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/payments/shipping_address_editor_view_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
@@ skipping 146 matching lines @@
     default:
       NOTREACHED();
       break;
   }
   return std::unique_ptr<ui::ComboboxModel>();
 }
 
 void ShippingAddressEditorViewController::OnPerformAction(
     views::Combobox* sender) {
   EditorViewController::OnPerformAction(sender);
-  if (sender->id() != autofill::ADDRESS_HOME_COUNTRY)
+  if (sender->id() != GetInputFieldViewId(autofill::ADDRESS_HOME_COUNTRY))
     return;
   DCHECK_GE(sender->selected_index(), 0);
   if (chosen_country_index_ != static_cast<size_t>(sender->selected_index())) {
     chosen_country_index_ = sender->selected_index();
     failed_to_load_region_data_ = false;
     // View update must be asynchronous to let the combobox finish performing
     // the action.
     OnDataChanged(/*synchronous=*/false);
   }
 }
 
 void ShippingAddressEditorViewController::UpdateEditorView() {
   EditorViewController::UpdateEditorView();
   if (chosen_country_index_ > 0UL &&
       chosen_country_index_ < countries_.size()) {
-    views::Combobox* country_combo_box = static_cast<views::Combobox*>(
-        dialog()->GetViewByID(autofill::ADDRESS_HOME_COUNTRY));
+    views::Combobox* country_combo_box =
+        static_cast<views::Combobox*>(dialog()->GetViewByID(
+            GetInputFieldViewId(autofill::ADDRESS_HOME_COUNTRY)));
     DCHECK(country_combo_box);
     DCHECK_EQ(countries_.size(),
               static_cast<size_t>(country_combo_box->GetRowCount()));
     country_combo_box->SetSelectedIndex(chosen_country_index_);
   } else if (countries_.size() > 0UL) {
     chosen_country_index_ = 0UL;
   } else {
     chosen_country_index_ = kInvalidCountryIndex;
   }
   // Ignore temporary profile once the editor view has been updated.
@@ skipping 158 matching lines @@
                        base::Unretained(this)));
   }
 }
 
 bool ShippingAddressEditorViewController::SaveFieldsToProfile(
     autofill::AutofillProfile* profile,
     bool ignore_errors) {
   const std::string& locale = state()->GetApplicationLocale();
   // The country must be set first, because the profile uses the country to
   // interpret some of the data (e.g., phone numbers) passed to SetInfo.
-  views::Combobox* combobox = static_cast<views::Combobox*>(
-      dialog()->GetViewByID(autofill::ADDRESS_HOME_COUNTRY));
+  views::Combobox* combobox =
+      static_cast<views::Combobox*>(dialog()->GetViewByID(
+          GetInputFieldViewId(autofill::ADDRESS_HOME_COUNTRY)));
   // The combobox can be null when saving to temporary profile while updating
   // the view.
   if (combobox) {
     base::string16 country(combobox->GetTextForRow(combobox->selected_index()));
     bool success =
         profile->SetInfo(autofill::AutofillType(autofill::ADDRESS_HOME_COUNTRY),
                          country, locale);
     LOG_IF(ERROR, !success && !ignore_errors)
         << "Can't set profile country to: " << country;
     if (!success && !ignore_errors)
@@ skipping 13 matching lines @@
     }
     LOG_IF(ERROR, !success && !ignore_errors)
         << "Can't setinfo(" << field.second.type << ", " << field.first->text();
     if (!success && !ignore_errors)
       return false;
   }
   for (const auto& field : comboboxes()) {
     // ValidatingCombobox* is the key, EditorField is the value.
     ValidatingCombobox* combobox = field.first;
     // The country has already been dealt with.
-    if (combobox->id() == autofill::ADDRESS_HOME_COUNTRY)
+    if (combobox->id() == GetInputFieldViewId(autofill::ADDRESS_HOME_COUNTRY))
       continue;
     if (combobox->IsValid()) {
       success = profile->SetInfo(
           autofill::AutofillType(field.second.type),
           combobox->GetTextForRow(combobox->selected_index()), locale);
     } else {
       success = false;
     }
     LOG_IF(ERROR, !success && !ignore_errors)
         << "Can't setinfo(" << field.second.type << ", "
         << combobox->GetTextForRow(combobox->selected_index());
     if (!success && !ignore_errors)
       return false;
   }
   return success;
 }
 
 void ShippingAddressEditorViewController::OnComboboxModelChanged(
     views::Combobox* combobox) {
-  if (combobox->id() != autofill::ADDRESS_HOME_STATE)
+  if (combobox->id() != GetInputFieldViewId(autofill::ADDRESS_HOME_STATE))
     return;
   autofill::RegionComboboxModel* model =
       static_cast<autofill::RegionComboboxModel*>(combobox->model());
   if (model->IsPendingRegionDataLoad())
     return;
   if (model->failed_to_load_data()) {
     failed_to_load_region_data_ = true;
     // It is safe to update synchronously since the change comes from the model
     // and not from the UI.
     OnDataChanged(/*synchronous=*/true);
@@ skipping 22 matching lines @@
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     IsValidCombobox(views::Combobox* combobox) {
   return ValidateValue(combobox->GetTextForRow(combobox->selected_index()),
                        nullptr);
 }
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     TextfieldValueChanged(views::Textfield* textfield) {
   base::string16 error_message;
   bool is_valid = ValidateValue(textfield->text(), &error_message);
-  controller_->DisplayErrorMessageForField(field_, error_message);
+  controller_->DisplayErrorMessageForField(field_.type, error_message);
   return is_valid;
 }
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ComboboxValueChanged(views::Combobox* combobox) {
   base::string16 error_message;
   bool is_valid = ValidateValue(
       combobox->GetTextForRow(combobox->selected_index()), &error_message);
-  controller_->DisplayErrorMessageForField(field_, error_message);
+  controller_->DisplayErrorMessageForField(field_.type, error_message);
   return is_valid;
 }
 
 void ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ComboboxModelChanged(views::Combobox* combobox) {
   controller_->OnComboboxModelChanged(combobox);
 }
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ValidateValue(const base::string16& value, base::string16* error_message) {
@@ skipping 13 matching lines @@
     return true;
   }
   if (error_message && field_.required) {
     *error_message = l10n_util::GetStringUTF16(
         IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
   }
   return !field_.required;
 }
 
 }  // namespace payments