Focus first invalid field of payment request editor

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

Index: chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
index de7486cf37a59b56efeb614d991eaee84b86d55a..55e5415cd5ffd88373f8f4233da97dc3b4b6c473 100644
--- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
@@ -396,13 +396,14 @@ ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ~ShippingAddressValidationDelegate() {}
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
-    ValidateTextfield(views::Textfield* textfield) {
-  return ValidateValue(textfield->text());
+    ValidateTextfield(views::Textfield* textfield, bool display_error) {
+  return ValidateValue(textfield->text(), display_error);
 }
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
-    ValidateCombobox(views::Combobox* combobox) {
-  return ValidateValue(combobox->GetTextForRow(combobox->selected_index()));
+    ValidateCombobox(views::Combobox* combobox, bool display_error) {
+  return ValidateValue(combobox->GetTextForRow(combobox->selected_index()),
+                       display_error);
 }
 
 void ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
@@ -411,19 +412,22 @@ void ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
 }
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
-    ValidateValue(const base::string16& value) {
+    ValidateValue(const base::string16& value, bool display_error) {
   if (!value.empty()) {
     if (field_.type == autofill::PHONE_HOME_WHOLE_NUMBER &&
         !autofill::IsValidPhoneNumber(
             value,
             controller_->country_codes_[controller_->chosen_country_index_])) {
-      controller_->DisplayErrorMessageForField(
-          field_, l10n_util::GetStringUTF16(
-                      IDS_PAYMENTS_PHONE_INVALID_VALIDATION_MESSAGE));
+      if (display_error) {
+        controller_->DisplayErrorMessageForField(
+            field_, l10n_util::GetStringUTF16(
+                        IDS_PAYMENTS_PHONE_INVALID_VALIDATION_MESSAGE));
+      }
       return false;
     }
     // As long as other field types are non-empty, they are valid.
-    controller_->DisplayErrorMessageForField(field_, base::ASCIIToUTF16(""));
+    if (display_error)
+      controller_->DisplayErrorMessageForField(field_, base::ASCIIToUTF16(""));
     return true;
   }
   bool is_required_valid = !field_.required;
@@ -431,7 +435,8 @@ bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
       is_required_valid ? base::ASCIIToUTF16("")
                         : l10n_util::GetStringUTF16(
                               IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
-  controller_->DisplayErrorMessageForField(field_, displayed_message);
+  if (display_error)
+    controller_->DisplayErrorMessageForField(field_, displayed_message);
   return is_required_valid;
 }