[Payments] Have expiration date be on the same line in CC editor

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 44 matching lines @@
               base::string16 label,
               LengthHint length_hint,
               bool required,
               ControlType control_type = ControlType::TEXTFIELD)
       : type(type),
         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.
   autofill::ServerFieldType type;
   // Label to be shown alongside the field.
   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.
 class EditorViewController : public PaymentRequestSheetController,
                              public views::TextfieldController,
                              public views::ComboboxListener {
  public:
   using TextFieldsMap =
       std::unordered_map<ValidatingTextfield*, const EditorField>;
   using ComboboxMap =
       std::unordered_map<ValidatingCombobox*, const EditorField>;
-  using ErrorLabelMap =
-      std::map<const EditorField, views::View*, EditorField::Compare>;
+  using ErrorLabelMap = std::map<autofill::ServerFieldType, views::View*>;
 
   // Does not take ownership of the arguments, which should outlive this object.
   // |back_navigation_type| identifies what sort of back navigation should be
   // done when editing is successful. This is independent of the back arrow
   // which always goes back one step.
   EditorViewController(PaymentRequestSpec* spec,
                        PaymentRequestState* state,
                        PaymentRequestDialogView* dialog,
                        BackNavigationType back_navigation_type);
   ~EditorViewController() override;
 
   // Will display |error_message| alongside the input field represented by
-  // |field|.
-  void DisplayErrorMessageForField(const EditorField& field,
+  // field |type|.
+  void DisplayErrorMessageForField(autofill::ServerFieldType type,
                                    const base::string16& error_message);
 
   const ComboboxMap& comboboxes() const { return comboboxes_; }
   const TextFieldsMap& text_fields() const { return text_fields_; }
 
+  // Returns the View ID that can be used to lookup the input field for |type|.
+  static int GetInputFieldViewId(autofill::ServerFieldType type);
+
  protected:
   // Create a header view to be inserted before all fields.
   virtual std::unique_ptr<views::View> CreateHeaderView();
   // |focusable_field| is to be set with a pointer to the view that should get
-  // default focus within the custom view.
+  // default focus within the custom view. |valid| should be set to the initial
+  // validity state of the custom view.
   virtual std::unique_ptr<views::View> CreateCustomFieldView(
       autofill::ServerFieldType type,
-      views::View** focusable_field);
+      views::View** focusable_field,
+      bool* valid);
   // Create an extra view to go to the right of the field with |type|, which
   // can either be a textfield, combobox, or custom view.
   virtual std::unique_ptr<views::View> CreateExtraViewForField(
       autofill::ServerFieldType type);
 
   // Returns the field definitions used to build the UI.
   virtual std::vector<EditorField> GetFieldDefinitions() = 0;
   virtual base::string16 GetInitialValueForType(
       autofill::ServerFieldType type) = 0;
   // Validates the data entered and attempts to save; returns true on success.
@@ skipping 15 matching lines @@
   // 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();
 
   // PaymentRequestSheetController:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
   views::View* GetFirstFocusedView() override;
 
+  // Will create a combobox according to the |field| definition. Will also keep
+  // track of this field to populate the edited model on save.
+  std::unique_ptr<ValidatingCombobox> CreateComboboxForField(
+      const EditorField& field);
+
  private:
   // views::TextfieldController:
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) 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();
 
   // Adds some views to |layout|, to represent an input field and its labels.
@@ skipping 24 matching lines @@
 
   // Identifies where to go back when the editing completes successfully.
   BackNavigationType back_navigation_type_;
 
   DISALLOW_COPY_AND_ASSIGN(EditorViewController);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_EDITOR_VIEW_CONTROLLER_H_