[WebPayments] Disabling done button when form invalid

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 390 matching lines @@
   if (!credit_card_to_edit_ || type == kBillingAddressType)
     return base::string16();
 
   base::string16 info = credit_card_to_edit_->GetInfo(
       autofill::AutofillType(type), state()->GetApplicationLocale());
 
   return type == autofill::CREDIT_CARD_NUMBER ? FormatCardNumber(info) : info;
 }
 
 bool CreditCardEditorViewController::ValidateModelAndSave() {
   const std::string& locale = state()->GetApplicationLocale();

[Mathieu, 2017/05/29 16:45:36]

this function changed a little bit recently, can you rebase?

[tmartino, 2017/05/29 21:06:58]

Done

   // Use a temporary object for validation.
   autofill::CreditCard credit_card;
   credit_card.set_origin(autofill::kSettingsOrigin);
 
+  if (!ValidateModel()) {
+    return false;
+  }
+
   for (const auto& field : text_fields()) {
     // ValidatingTextfield* is the key, EditorField is the value.
     DCHECK_EQ(autofill::CREDIT_CARD,
               autofill::AutofillType(field.second.type).group());
-    if (field.first->invalid())
-      return false;
-
     credit_card.SetInfo(autofill::AutofillType(field.second.type),
                         field.first->text(), locale);
   }
   for (const auto& field : comboboxes()) {
     // ValidatingCombobox* is the key, EditorField is the value.
     ValidatingCombobox* combobox = field.first;
-    if (combobox->invalid())
-      return false;
 
     if (field.second.type == kBillingAddressType) {
       views::Combobox* address_combobox = static_cast<views::Combobox*>(
           dialog()->GetViewByID(GetInputFieldViewId(kBillingAddressType)));
       autofill::AddressComboboxModel* model =
           static_cast<autofill::AddressComboboxModel*>(
               address_combobox->model());
 
       credit_card.set_billing_address_id(
           model->GetItemIdentifierAt(address_combobox->selected_index()));
@@ skipping 298 matching lines @@
   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