Add billing address as a mandatory field of Payments credit cards.

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 <map>
 #include <memory>
 #include <utility>
 
@@ skipping 28 matching lines @@
   // The tag for the button that saves the model being edited. Starts at
   // |kFirstTagValue| not to conflict with tags common to all views.
   SAVE_BUTTON = kFirstTagValue,
 };
 
 constexpr int kNumCharactersInShortField = 8;
 constexpr int kNumCharactersInLongField = 20;
 
 }  // namespace
 
-EditorViewController::EditorViewController(PaymentRequestSpec* spec,
-                                           PaymentRequestState* state,
-                                           PaymentRequestDialogView* dialog)
-    : PaymentRequestSheetController(spec, state, dialog) {}
+EditorViewController::EditorViewController(
+    PaymentRequestSpec* spec,
+    PaymentRequestState* state,
+    PaymentRequestDialogView* dialog,
+    BackNavigationType back_navigation_type)
+    : PaymentRequestSheetController(spec, state, dialog),
+      back_navigation_type_(back_navigation_type) {}
 
 EditorViewController::~EditorViewController() {}
 
 void EditorViewController::DisplayErrorMessageForField(
     const EditorField& field,
     const base::string16& error_message) {
   const auto& label_it = error_labels_.find(field);
   DCHECK(label_it != error_labels_.end());
   label_it->second->SetText(error_message);
   label_it->second->SchedulePaint();
@@ skipping 16 matching lines @@
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_STRETCH);
   content_view->SetLayoutManager(layout);
   // No insets. Child views below are responsible for their padding.
 
   // An editor can optionally have a header view specific to it.
   content_view->AddChildView(CreateHeaderView().release());
 
   // The heart of the editor dialog: all the input fields with their labels.
   content_view->AddChildView(CreateEditorView().release());
+
+  // Room for custom fields that can't be expressed with a field definition.
+  content_view->AddChildView(CreateCustomFieldsView().release());
 }
 
 // Adds the "required fields" label in disabled text, to obtain this result.
 // +---------------------------------------------------------+
 // | "* indicates required fields"           | CANCEL | DONE |
 // +---------------------------------------------------------+
 std::unique_ptr<views::View> EditorViewController::CreateExtraFooterView() {
   std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
   views::BoxLayout* layout =
@@ skipping 17 matching lines @@
   UpdateContentView();
   // TODO(crbug.com/704254): Find how to update the parent view bounds so that
   // the vertical scrollbar size gets updated.
   dialog()->EditorViewUpdated();
 }
 
 void EditorViewController::ButtonPressed(views::Button* sender,
                                          const ui::Event& event) {
   switch (sender->tag()) {
     case static_cast<int>(EditorViewControllerTags::SAVE_BUTTON):
-      if (ValidateModelAndSave())
-        dialog()->GoBackToPaymentSheet();
+      if (ValidateModelAndSave()) {
+        switch (back_navigation_type_) {
+          case BackNavigationType::kOneStep:
+            dialog()->GoBack();
+            break;
+          case BackNavigationType::kPaymentSheet:
+            dialog()->GoBackToPaymentSheet();
+            break;
+        }
+      }
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 void EditorViewController::ContentsChanged(views::Textfield* sender,
                                            const base::string16& new_contents) {
   static_cast<ValidatingTextfield*>(sender)->OnContentsChanged();
@@ skipping 23 matching lines @@
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 0,
                      views::GridLayout::USE_PREF, 0, 0);
 
   // This is the horizontal padding between the label and the input field.
   constexpr int kLabelInputFieldHorizontalPadding = 16;
   columns->AddPaddingColumn(0, kLabelInputFieldHorizontalPadding);
 
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 0,
                      views::GridLayout::USE_PREF, 0, 0);
 
-  // The LayoutManager needs to be set before input fields are created, so we
-  // keep a handle to it before we release it to the view.
-  views::GridLayout* layout_handle = editor_layout.get();
   editor_view->SetLayoutManager(editor_layout.release());
   std::vector<EditorField> fields = GetFieldDefinitions();
   for (const auto& field : fields) {
-    CreateInputField(layout_handle, field);
+    CreateInputField(
+        static_cast<views::GridLayout*>(editor_view->GetLayoutManager()),
+        field);
   }
 
   return editor_view;
 }
 
 // Each input field is a 4-quadrant grid.
 // +----------------------------------------------------------+
 // | Field Label           | Input field (textfield/combobox) |
 // |_______________________|__________________________________|
 // |   (empty)             | Error label                      |
 // +----------------------------------------------------------+
 void EditorViewController::CreateInputField(views::GridLayout* layout,
                                             const EditorField& field) {
   // This is the top padding for every row.
-  constexpr int kInputRowSpacing = 6;
   layout->StartRowWithPadding(0, 0, 0, kInputRowSpacing);
 
   std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(
       field.required ? field.label + base::ASCIIToUTF16("*") : field.label);
-  // A very long label will wrap. Value picked so that left + right label
-  // padding bring the label to half-way in the dialog (~225).
-  constexpr int kMaximumLabelWidth = 192;
+
+  // A very long label will wrap.
   label->SetMultiLine(true);
   label->SetMaximumWidth(kMaximumLabelWidth);
   layout->AddView(label.release());
 
   if (field.control_type == EditorField::ControlType::TEXTFIELD) {
     ValidatingTextfield* text_field =
         new ValidatingTextfield(CreateValidationDelegate(field));
     text_field->SetText(GetInitialValueForType(field.type));
     text_field->set_controller(this);
     // Using autofill field type as a view ID (for testing).
@@ skipping 10 matching lines @@
     ValidatingCombobox* combobox = new ValidatingCombobox(
         GetComboboxModelForType(field.type), CreateValidationDelegate(field));
     combobox->SelectValue(GetInitialValueForType(field.type));
     // Using autofill field type as a view ID (for testing).
     combobox->set_id(static_cast<int>(field.type));
     combobox->set_listener(this);
     comboboxes_.insert(std::make_pair(combobox, field));
     // |combobox| will now be owned by |row|.
     layout->AddView(combobox);
   } else {
     NOTREACHED();

[Mathieu, 2017/05/04 20:29:19]

I add an idea when looking at this. You could define a special ControlType
similar to COMBOBOX or TEXTFIELD, and if this base class doesn't know about it,
it could query the subclass to get the view for it.

this line would become
layout->AddView(GetViewForControlType(field.control_type). 

In the subclass you would save all the layout/label creation, which should be
the same for all fields. It doesn't preclude you from having layouts *inside*
the view you are returning to the base class.

Also this way we can have special input fields all over the view, not just at
the end. 

Let me know if this would work.

[MAD, 2017/05/05 00:50:07]

Excellent idea... Done!

   }
 
   // This is the vertical space between the input field and its error label.
   constexpr int kInputErrorLabelPadding = 6;
   layout->StartRowWithPadding(0, 0, 0, kInputErrorLabelPadding);
   layout->SkipColumns(1);
   // Error label is initially empty.
   std::unique_ptr<views::Label> error_label =
       base::MakeUnique<views::Label>(base::ASCIIToUTF16(""));
   error_label->set_id(static_cast<int>(DialogViewID::ERROR_LABEL_OFFSET) +
                       field.type);
   error_label->SetFontList(
       error_label->GetDefaultFontList().DeriveWithSizeDelta(-1));
   error_label->SetEnabledColor(error_label->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_AlertSeverityHigh));
   error_labels_[field] = error_label.get();
 
   layout->AddView(error_label.release());
 }
 
 }  // namespace payments