[Web Payments] Refactor sheet display to allow updating view content

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

Index: chrome/browser/ui/views/payments/editor_view_controller.h
diff --git a/chrome/browser/ui/views/payments/editor_view_controller.h b/chrome/browser/ui/views/payments/editor_view_controller.h
index dd72bb43d3712c2e49b87d5a80417dd371402c82..e859c032ed147362e1abc42fb6cd1bd843b6a080 100644
--- a/chrome/browser/ui/views/payments/editor_view_controller.h
+++ b/chrome/browser/ui/views/payments/editor_view_controller.h
@@ -94,9 +94,6 @@ class EditorViewController : public PaymentRequestSheetController,
                        PaymentRequestDialogView* dialog);
   ~EditorViewController() override;
 
-  // PaymentRequestSheetController:
-  std::unique_ptr<views::View> CreateView() override;
-
   // Will display |error_message| alongside the input field represented by
   // |field|.
   void DisplayErrorMessageForField(const EditorField& field,
@@ -107,8 +104,6 @@ class EditorViewController : public PaymentRequestSheetController,
 
  protected:
   virtual std::unique_ptr<views::View> CreateHeaderView() = 0;
-  // Returns the resource id of the view header title.
-  virtual int GetViewHeaderTitleId() const = 0;
   // Returns the field definitions used to build the UI.
   virtual std::vector<EditorField> GetFieldDefinitions() = 0;
   // Validates the data entered and attempts to save; returns true on success.
@@ -122,6 +117,7 @@ class EditorViewController : public PaymentRequestSheetController,
 
   // PaymentRequestSheetController;
   std::unique_ptr<views::Button> CreatePrimaryButton() override;
+  void FillContentView(views::View* content_view) override;
   std::unique_ptr<views::View> CreateExtraFooterView() override;
 
   // views::ComboboxListener:
@@ -143,7 +139,7 @@ class EditorViewController : public PaymentRequestSheetController,
 
   // Creates the whole editor view to go within the editor dialog. It
   // encompasses all the input fields created by CreateInputField().
-  void CreateEditorView();
+  std::unique_ptr<views::View> 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
@@ -151,15 +147,6 @@ class EditorViewController : public PaymentRequestSheetController,
   // added (see implementation).
   void CreateInputField(views::GridLayout* layout, const EditorField& field);
 
-  // The implementation of UpdateEditorView which is also called from
-  // CreateEditorView.
-  void UpdateEditorViewImpl();
-
-  // 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