[Payments] Changes to validation in the Credit Card editor

chrome/browser/ui/views/payments/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/editor_view_controller.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <utility>
@@ skipping 74 matching lines @@
       back_navigation_type_(back_navigation_type) {}
 
 EditorViewController::~EditorViewController() {}
 
 void EditorViewController::DisplayErrorMessageForField(
     autofill::ServerFieldType type,
     const base::string16& error_message) {
   const auto& label_view_it = error_labels_.find(type);
   DCHECK(label_view_it != error_labels_.end());
 
-  label_view_it->second->RemoveAllChildViews(/*delete_children=*/true);
-  if (!error_message.empty()) {
-    label_view_it->second->AddChildView(
-        CreateErrorLabelView(error_message, type).release());
+  if (error_message.empty()) {
+    label_view_it->second->RemoveAllChildViews(/*delete_children=*/true);
+  } else {
+    if (!label_view_it->second->has_children()) {
+      // If there was no error label view, add it.
+      label_view_it->second->AddChildView(
+          CreateErrorLabelView(error_message, type).release());
+    } else {
+      // The error view is the only child, and has a Label as only child itself.
+      static_cast<views::Label*>(
+          label_view_it->second->child_at(0)->child_at(0))
+          ->SetText(error_message);
+    }
   }
   RelayoutPane();
 }
 
 // static
 int EditorViewController::GetInputFieldViewId(autofill::ServerFieldType type) {
   return static_cast<int>(DialogViewID::INPUT_FIELD_TYPE_OFFSET) +
          static_cast<int>(type);
 }
 
@@ skipping 72 matching lines @@
     return initial_focus_field_view_;
   return PaymentRequestSheetController::GetFirstFocusedView();
 }
 
 std::unique_ptr<ValidatingCombobox>
 EditorViewController::CreateComboboxForField(const EditorField& field) {
   std::unique_ptr<ValidatingCombobox> combobox =
       base::MakeUnique<ValidatingCombobox>(GetComboboxModelForType(field.type),
                                            CreateValidationDelegate(field));
   base::string16 initial_value = GetInitialValueForType(field.type);
-  if (!initial_value.empty())
+  if (!initial_value.empty()) {
     combobox->SelectValue(initial_value);
+    combobox->SetInvalid(!combobox->IsValid());
+  }
   // Using autofill field type as a view ID.
   combobox->set_id(GetInputFieldViewId(field.type));
   combobox->set_listener(this);
   comboboxes_.insert(std::make_pair(combobox.get(), field));
   return combobox;
 }
 
 void EditorViewController::ContentsChanged(views::Textfield* sender,
                                            const base::string16& new_contents) {
   static_cast<ValidatingTextfield*>(sender)->OnContentsChanged();
@@ skipping 135 matching lines @@
 
   label->SetMultiLine(true);
   layout->AddView(label.release());
 
   views::View* focusable_field = nullptr;
   constexpr int kInputFieldHeight = 28;
   if (field.control_type == EditorField::ControlType::TEXTFIELD ||
       field.control_type == EditorField::ControlType::TEXTFIELD_NUMBER) {
     ValidatingTextfield* text_field =
         new ValidatingTextfield(CreateValidationDelegate(field));
-    text_field->SetText(GetInitialValueForType(field.type));
+    // Set the initial value and validity state.
+    base::string16 initial_value = GetInitialValueForType(field.type);
+    text_field->SetText(initial_value);
+    *valid = text_field->IsValid();
+    if (!initial_value.empty())
+      text_field->SetInvalid(!(*valid));
+
     if (field.control_type == EditorField::ControlType::TEXTFIELD_NUMBER)
       text_field->SetTextInputType(ui::TextInputType::TEXT_INPUT_TYPE_NUMBER);
     text_field->set_controller(this);
     // Using autofill field type as a view ID (for testing).
     text_field->set_id(GetInputFieldViewId(field.type));
     text_fields_.insert(std::make_pair(text_field, field));
     focusable_field = text_field;
-    *valid = text_field->IsValid();
 
     // |text_field| will now be owned by |row|.
     layout->AddView(text_field, 1, 1, views::GridLayout::FILL,
                     views::GridLayout::FILL, 0, kInputFieldHeight);
   } else if (field.control_type == EditorField::ControlType::COMBOBOX) {
     std::unique_ptr<ValidatingCombobox> combobox =
         CreateComboboxForField(field);
 
     focusable_field = combobox.get();
     *valid = combobox->IsValid();
@@ skipping 43 matching lines @@
         CreateExtraViewForField(field.type);
     if (!extra_view)
       continue;
     widest_column_width =
         std::max(extra_view->GetPreferredSize().width(), widest_column_width);
   }
   return widest_column_width;
 }
 
 }  // namespace payments