Adding new shipping address editor view to payment flow.

chrome/browser/ui/views/payments/editor_view_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PAYMENTS_EDITOR_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_EDITOR_VIEW_CONTROLLER_H_
 
 #include <map>
 #include <memory>
 #include <tuple>
@@ skipping 30 matching lines @@
 class PaymentRequestDialogView;
 class ValidatingCombobox;
 class ValidatingTextfield;
 
 // Field definition for an editor field, used to build the UI.
 struct EditorField {
   enum class LengthHint : int { HINT_LONG, HINT_SHORT };
   enum class ControlType : int { TEXTFIELD, COMBOBOX };
 
   EditorField(autofill::ServerFieldType type,
-              const base::string16& label,
+              base::string16 label,
               LengthHint length_hint,
               bool required,
               ControlType control_type = ControlType::TEXTFIELD)
       : type(type),
-        label(label),
+        label(std::move(label)),
         length_hint(length_hint),
         required(required),
         control_type(control_type) {}
 
   struct Compare {
     bool operator()(const EditorField& lhs, const EditorField& rhs) const {
       return std::tie(lhs.type, lhs.label) < std::tie(rhs.type, rhs.label);
     }
   };
 
   // Data type in the field.
-  const autofill::ServerFieldType type;
+  autofill::ServerFieldType type;
   // Label to be shown alongside the field.
-  const base::string16 label;
+  base::string16 label;
   // Hint about the length of this field's contents.
   LengthHint length_hint;
   // Whether the field is required.
   bool required;
   // The control type.
   ControlType control_type;
 };
 
 // The PaymentRequestSheetController subtype for the editor screens of the
 // Payment Request flow.
@@ skipping 37 matching lines @@
   // |field| definition.
   virtual std::unique_ptr<ValidationDelegate> CreateValidationDelegate(
       const EditorField& field) = 0;
   virtual std::unique_ptr<ui::ComboboxModel> GetComboboxModelForType(
       const autofill::ServerFieldType& type) = 0;
 
   // PaymentRequestSheetController;
   std::unique_ptr<views::Button> CreatePrimaryButton() override;
   std::unique_ptr<views::View> CreateExtraFooterView() override;
 
+  // views::ComboboxListener:
+  void OnPerformAction(views::Combobox* combobox) override;
+
+  // Update the editor view by removing all it's child views and recreating
+  // the input fields returned by GetFieldDefinitions. Note that
+  // CreateEditorView MUST have been called at least once before calling
+  // UpdateEditorView.
+  virtual void UpdateEditorView();
+
  private:
   // PaymentRequestSheetController:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::TextfieldController:
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) override;
 
-  // views::ComboboxListener:
-  void OnPerformAction(views::Combobox* combobox) override;
-
   // Creates the whole editor view to go within the editor dialog. It
   // encompasses all the input fields created by CreateInputField().
-  std::unique_ptr<views::View> CreateEditorView();
+  void CreateEditorView();
 
   // Adds some views to |layout|, to represent an input field and its labels.
   // |field| is the field definition, which contains the label and the hint
   // about the length of the input field. A placeholder error label is also
   // added (see implementation).
   void CreateInputField(views::GridLayout* layout, const EditorField& field);
 
+  // The editor content view, owned by the client so the derived classes can
+  // refresh it when some user interactions cause layout changes by calling
+  // UpdateEditorView().
+  std::unique_ptr<views::View> editor_view_;
+
   // Used to remember the association between the input field UI element and the
   // original field definition. The ValidatingTextfield* and ValidatingCombobox*
   // are owned by their parent view, this only keeps a reference that is good as
   // long as the input field is visible.
   TextFieldsMap text_fields_;
   ComboboxMap comboboxes_;
   // Tracks the relationship between a field and its error label.
   ErrorLabelMap error_labels_;
 
   DISALLOW_COPY_AND_ASSIGN(EditorViewController);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_EDITOR_VIEW_CONTROLLER_H_