Adding new shipping address editor view to payment flow.

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 50 matching lines @@
   layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_START);
   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());
+  CreateEditorView();
+  content_view->AddChildView(editor_view_.get());
 
   return CreatePaymentView(
       CreateSheetHeaderView(
           true, l10n_util::GetStringUTF16(GetViewHeaderTitleId()), this),
       std::move(content_view));
 }
 
 void EditorViewController::DisplayErrorMessageForField(
     const EditorField& field,
     const base::string16& error_message) {
@@ skipping 30 matching lines @@
   // Adds the "* indicates a required field" label in "disabled" grey text.
   std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(
       l10n_util::GetStringUTF16(IDS_PAYMENTS_REQUIRED_FIELD_MESSAGE));
   label->SetDisabledColor(label->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor));
   label->SetEnabled(false);
   content_view->AddChildView(label.release());
   return content_view;
 }
 
-void EditorViewController::ButtonPressed(views::Button* sender,
-                                         const ui::Event& event) {
-  switch (sender->tag()) {
-    case static_cast<int>(EditorViewControllerTags::SAVE_BUTTON):
-      if (ValidateModelAndSave())
-        dialog()->GoBack();
-      break;
-    default:
-      PaymentRequestSheetController::ButtonPressed(sender, event);
-      break;
-  }
-}
+void EditorViewController::UpdateEditorView() {
+  DCHECK_NE(nullptr, editor_view_.get());
+  text_fields_.clear();
+  comboboxes_.clear();
+  editor_view_->RemoveAllChildViews(true);
 
-void EditorViewController::ContentsChanged(views::Textfield* sender,
-                                           const base::string16& new_contents) {
-  static_cast<ValidatingTextfield*>(sender)->OnContentsChanged();
-}
-
-void EditorViewController::OnPerformAction(views::Combobox* sender) {
-  static_cast<ValidatingCombobox*>(sender)->OnContentsChanged();
-}
-
-std::unique_ptr<views::View> EditorViewController::CreateEditorView() {
-  std::unique_ptr<views::View> editor_view = base::MakeUnique<views::View>();
-
-  views::GridLayout* editor_layout = new views::GridLayout(editor_view.get());
+  views::GridLayout* editor_layout = new views::GridLayout(editor_view_.get());

[anthonyvd, 2017/03/21 21:18:24]

For consistency, this should be a unique_ptr created with base::MakeUnique that
gets released in the call to SetLayoutManager. The rest of payments code does it
that way to make ownership clearer (except in cases where the result of the new
call is passed directly to a views:: function, like my_view->AddChildView(new
views::View);)

[MAD, 2017/03/22 20:15:42]

Done.

 
   // The editor grid layout is padded vertically from the top and bottom, and
   // horizontally inset like other content views. The top padding needs to be
   // added to the top padding of the first row.
   constexpr int kEditorVerticalInset = 16;
   editor_layout->SetInsets(
       kEditorVerticalInset, payments::kPaymentRequestRowHorizontalInsets,
       kEditorVerticalInset, payments::kPaymentRequestRowHorizontalInsets);
 
-  editor_view->SetLayoutManager(editor_layout);
+  editor_view_->SetLayoutManager(editor_layout);
   views::ColumnSet* columns = editor_layout->AddColumnSet(0);
   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);
 
   std::vector<EditorField> fields = GetFieldDefinitions();
   for (const auto& field : fields) {
     CreateInputField(editor_layout, field);
   }
+  editor_view_->Layout();
+  // TODO(mad): Find how to update the view bounds so that the vertical
+  // scrollbar size gets updated.
+}
 
-  return editor_view;
+void EditorViewController::ButtonPressed(views::Button* sender,
+                                         const ui::Event& event) {
+  switch (sender->tag()) {
+    case static_cast<int>(EditorViewControllerTags::SAVE_BUTTON):
+      if (ValidateModelAndSave())
+        dialog()->GoBack();
+      break;
+    default:
+      PaymentRequestSheetController::ButtonPressed(sender, event);
+      break;
+  }
+}
+
+void EditorViewController::ContentsChanged(views::Textfield* sender,
+                                           const base::string16& new_contents) {
+  static_cast<ValidatingTextfield*>(sender)->OnContentsChanged();
+}
+
+void EditorViewController::OnPerformAction(views::Combobox* sender) {
+  static_cast<ValidatingCombobox*>(sender)->OnContentsChanged();
+}
+
+void EditorViewController::CreateEditorView() {
+  editor_view_ = base::MakeUnique<views::View>();
+  editor_view_->set_owned_by_client();
+
+  UpdateEditorView();
 }
 
 // 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) {
@@ skipping 49 matching lines @@
   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