Focus first invalid field of payment request editor

chrome/browser/ui/views/payments/credit_card_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/credit_card_editor_view_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 371 matching lines @@
 void CreditCardEditorViewController::AddAndSelectNewBillingAddress(
     const autofill::AutofillProfile& profile) {
   views::Combobox* address_combobox =
       static_cast<views::Combobox*>(dialog()->GetViewByID(kBillingAddressType));
   autofill::AddressComboboxModel* model =
       static_cast<autofill::AddressComboboxModel*>(address_combobox->model());
   int index = model->AddNewProfile(profile);
   // SetSelectedIndex doesn't trigger a perform action notification, which is
   // needed to update the valid state.
   address_combobox->SetSelectedRow(index);
+  // But it needs to be blured at least once.
+  address_combobox->OnBlur();
 }
 
 CreditCardEditorViewController::CreditCardValidationDelegate::
     CreditCardValidationDelegate(
         const EditorField& field,
         EditorViewController* controller,
         const std::vector<std::string>& supported_card_networks)
     : field_(field),
       controller_(controller),
       supported_card_networks_(supported_card_networks.begin(),
                                supported_card_networks.end()) {}
 CreditCardEditorViewController::CreditCardValidationDelegate::
     ~CreditCardValidationDelegate() {}
 
 bool CreditCardEditorViewController::CreditCardValidationDelegate::
-    ValidateTextfield(views::Textfield* textfield) {
-  return ValidateValue(textfield->text());
+    IsValidTextfield(views::Textfield* textfield) {
+  return ValidateValue(textfield->text(), nullptr);
 }
 
 bool CreditCardEditorViewController::CreditCardValidationDelegate::
-    ValidateCombobox(views::Combobox* combobox) {
+    IsValidCombobox(views::Combobox* combobox) {
+  return ValidateCombobox(combobox, nullptr);
+}
+
+bool CreditCardEditorViewController::CreditCardValidationDelegate::
+    TextfieldValueChanged(views::Textfield* textfield) {
+  base::string16 error_message;
+  bool is_valid = ValidateValue(textfield->text(), &error_message);
+  controller_->DisplayErrorMessageForField(field_, error_message);
+  return is_valid;
+}
+
+bool CreditCardEditorViewController::CreditCardValidationDelegate::
+    ComboboxValueChanged(views::Combobox* combobox) {
+  base::string16 error_message;
+  bool is_valid = ValidateCombobox(combobox, nullptr);
+  controller_->DisplayErrorMessageForField(field_, error_message);
+  return is_valid;
+}
+
+bool CreditCardEditorViewController::CreditCardValidationDelegate::
+    ValidateValue(const base::string16& value, base::string16* error_message) {
+  if (!value.empty()) {
+    base::string16 local_error_message;
+    bool is_valid =
+        field_.type == autofill::CREDIT_CARD_NUMBER
+            ? autofill::IsValidCreditCardNumberForBasicCardNetworks(
+                  value, supported_card_networks_, &local_error_message)
+            : autofill::IsValidForType(value, field_.type,
+                                       &local_error_message);
+    if (error_message)
+      *error_message = local_error_message;
+    return is_valid;
+  }
+
+  if (error_message && field_.required) {
+    *error_message = l10n_util::GetStringUTF16(
+        IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
+  }
+  return !field_.required;
+}
+
+bool CreditCardEditorViewController::CreditCardValidationDelegate::
+    ValidateCombobox(views::Combobox* combobox, base::string16* error_message) {
   // The billing address ID is the selected item identifier and not the combobox
   // value itself.
   if (field_.type == kBillingAddressType) {
     // TODO(crbug.com/718905) Find a way to deal with existing incomplete
     // addresses when choosing them as billing addresses.
     autofill::AddressComboboxModel* model =
         static_cast<autofill::AddressComboboxModel*>(combobox->model());
-    return !model->GetItemIdentifierAt(combobox->selected_index()).empty();
+    if (model->GetItemIdentifierAt(combobox->selected_index()).empty()) {
+      if (error_message) {
+        *error_message =
+            l10n_util::GetStringUTF16(IDS_PAYMENTS_BILLING_ADDRESS_REQUIRED);
+      }
+      return false;
+    }
+    return true;
   }
-  return ValidateValue(combobox->GetTextForRow(combobox->selected_index()));
-}
-
-bool CreditCardEditorViewController::CreditCardValidationDelegate::
-    ValidateValue(const base::string16& value) {
-  if (!value.empty()) {
-    base::string16 error_message;
-    bool is_valid =
-        field_.type == autofill::CREDIT_CARD_NUMBER
-            ? autofill::IsValidCreditCardNumberForBasicCardNetworks(
-                  value, supported_card_networks_, &error_message)
-            : autofill::IsValidForType(value, field_.type, &error_message);
-    controller_->DisplayErrorMessageForField(field_, error_message);
-    return is_valid;
-  }
-
-  bool is_required_valid = !field_.required;
-  const base::string16 displayed_message =
-      is_required_valid ? base::ASCIIToUTF16("")
-                        : l10n_util::GetStringUTF16(
-                              IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
-  controller_->DisplayErrorMessageForField(field_, displayed_message);
-  return is_required_valid;
+  return ValidateValue(combobox->GetTextForRow(combobox->selected_index()),
+                       error_message);
 }
 
 bool CreditCardEditorViewController::GetSheetId(DialogViewID* sheet_id) {
   *sheet_id = DialogViewID::CREDIT_CARD_EDITOR_SHEET;
   return true;
 }
 
 }  // namespace payments