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 150 matching lines @@
   }
   view->AddChildView(icons_row.release());
 
   return view;
 }
 
 std::unique_ptr<views::View>
 CreditCardEditorViewController::CreateExtraViewForField(
     autofill::ServerFieldType type) {
   if (type != kBillingAddressType)
-    return nullptr;
+    return std::unique_ptr<views::View>();

[anthonyvd, 2017/05/12 14:19:44]

nit: just nullptr was fine and it's what we use elsewhere.

[MAD, 2017/05/18 16:01:44]

Done.

 
   std::unique_ptr<views::View> button_view = base::MakeUnique<views::View>();
   button_view->SetLayoutManager(new views::FillLayout);
 
   // The button to add new billing addresses.
   std::unique_ptr<views::Button> add_button(
       views::MdTextButton::Create(this, l10n_util::GetStringUTF16(IDS_ADD)));
   add_button->set_id(
       static_cast<int>(DialogViewID::ADD_BILLING_ADDRESS_BUTTON));
   add_button->set_tag(add_billing_address_button_tag_);
@@ skipping 201 matching lines @@
         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());
+    ValidateTextfield(views::Textfield* textfield, bool display_error) {
+  return ValidateValue(textfield->text(), display_error);
 }
 
 bool CreditCardEditorViewController::CreditCardValidationDelegate::
-    ValidateCombobox(views::Combobox* combobox) {
+    ValidateCombobox(views::Combobox* combobox, bool display_error) {
   // 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();
   }
-  return ValidateValue(combobox->GetTextForRow(combobox->selected_index()));
+  return ValidateValue(combobox->GetTextForRow(combobox->selected_index()),
+                       display_error);
 }
 
 bool CreditCardEditorViewController::CreditCardValidationDelegate::
-    ValidateValue(const base::string16& value) {
+    ValidateValue(const base::string16& value, bool display_error) {
   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);
+    if (display_error)
+      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);
+  if (display_error)
+    controller_->DisplayErrorMessageForField(field_, displayed_message);
   return is_required_valid;
 }
 
 bool CreditCardEditorViewController::GetSheetId(DialogViewID* sheet_id) {
   *sheet_id = DialogViewID::CREDIT_CARD_EDITOR_SHEET;
   return true;
 }
 
 }  // namespace payments