[Payments] Add error messages to credit card 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 <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
@@ skipping 74 matching lines @@
 // credit card editor.
 // +----------------------------------------------+
 // | Cards Accepted                               |
 // |                                              |
 // | | VISA | | MC | | AMEX |                     |
 // +----------------------------------------------+
 std::unique_ptr<views::View>
 CreditCardEditorViewController::CreateHeaderView() {
   std::unique_ptr<views::View> view = base::MakeUnique<views::View>();
 
-  // 9dp is required between the first and second row.
-  constexpr int kRowVerticalInset = 9;
+  // 9dp is required between the first row (label) and second row (icons).
+  constexpr int kRowVerticalSpacing = 9;
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kVertical, payments::kPaymentRequestRowHorizontalInsets,
-      payments::kPaymentRequestRowVerticalInsets, kRowVerticalInset);
+      0, kRowVerticalSpacing);
   layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_START);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   view->SetLayoutManager(layout);
 
   // "Cards accepted" label is "disabled" grey.
   std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(
       l10n_util::GetStringUTF16(IDS_PAYMENTS_ACCEPTED_CARDS_LABEL));
   label->SetDisabledColor(label->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor));
@@ skipping 19 matching lines @@
 
     icons_row->AddChildView(card_icon_view.release());
   }
   view->AddChildView(icons_row.release());
 
   return view;
 }
 
 std::vector<EditorField> CreditCardEditorViewController::GetFieldDefinitions() {
   return std::vector<EditorField>{
+      {autofill::CREDIT_CARD_NUMBER,
+       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_CREDIT_CARD_NUMBER),
+       EditorField::LengthHint::HINT_LONG, /* required= */ true},
       {autofill::CREDIT_CARD_NAME_FULL,
        l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_NAME_ON_CARD),
        EditorField::LengthHint::HINT_LONG, /* required= */ true},
-      {autofill::CREDIT_CARD_NUMBER,
-       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_CREDIT_CARD_NUMBER),
-       EditorField::LengthHint::HINT_LONG, /* required= */ true},
       {autofill::CREDIT_CARD_EXP_MONTH,
        l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_EXPIRATION_MONTH),
        EditorField::LengthHint::HINT_SHORT, /* required= */ true,
        EditorField::ControlType::COMBOBOX},
       {autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR,
        l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_EXPIRATION_YEAR),
        EditorField::LengthHint::HINT_SHORT, /* required= */ true,
        EditorField::ControlType::COMBOBOX}};
 }
 
@@ skipping 28 matching lines @@
   // Add the card (will not add a duplicate).
   request()->personal_data_manager()->AddCreditCard(credit_card);
 
   return true;
 }
 
 std::unique_ptr<ValidationDelegate>
 CreditCardEditorViewController::CreateValidationDelegate(
     const EditorField& field) {
   return base::MakeUnique<
-      CreditCardEditorViewController::CreditCardValidationDelegate>(field);
+      CreditCardEditorViewController::CreditCardValidationDelegate>(field,
+                                                                    this);
 }
 
 std::unique_ptr<ui::ComboboxModel>
 CreditCardEditorViewController::GetComboboxModelForType(
     const autofill::ServerFieldType& type) {
   switch (type) {
     case autofill::CREDIT_CARD_EXP_MONTH: {
       int default_index = 0;
       std::vector<base::string16> months =
           GetExpirationMonthItems(&default_index);
       return std::unique_ptr<ui::ComboboxModel>(
           new PreselectedComboboxModel(months, default_index));
     }
     case autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR:
       return std::unique_ptr<ui::ComboboxModel>(
           new ui::SimpleComboboxModel(GetExpirationYearItems()));
     default:
       NOTREACHED();
       break;
   }
   return std::unique_ptr<ui::ComboboxModel>();
 }
 
 CreditCardEditorViewController::CreditCardValidationDelegate::
-    CreditCardValidationDelegate(const EditorField& field)
-    : field_(field) {}
+    CreditCardValidationDelegate(const EditorField& field,
+                                 EditorViewController* controller)
+    : field_(field), controller_(controller) {}
 CreditCardEditorViewController::CreditCardValidationDelegate::
     ~CreditCardValidationDelegate() {}
 
 bool CreditCardEditorViewController::CreditCardValidationDelegate::
     ValidateTextfield(views::Textfield* textfield) {
   return ValidateValue(textfield->text());
 }
 
 bool CreditCardEditorViewController::CreditCardValidationDelegate::
     ValidateCombobox(views::Combobox* combobox) {
   return ValidateValue(combobox->GetTextForRow(combobox->selected_index()));
 }
 
 bool CreditCardEditorViewController::CreditCardValidationDelegate::
     ValidateValue(const base::string16& value) {
   if (!value.empty()) {
     base::string16 error_message;
-    // TODO(mathp): Display |error_message| around |textfield|.
-    return autofill::IsValidForType(value, field_.type, &error_message);
+    bool is_valid =
+        autofill::IsValidForType(value, field_.type, &error_message);
+    controller_->DisplayErrorMessageForField(field_, error_message);
+    return is_valid;
   }
 
-  // TODO(mathp): Display "required" error if applicable.
-  return !field_.required;
+  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;
 }
 
 }  // namespace payments