[Payments] Fix up field widths in desktop editors.

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 89 matching lines @@
 
   // Will display |error_message| alongside the input field represented by
   // |field|.
   void DisplayErrorMessageForField(const EditorField& field,
                                    const base::string16& error_message);
 
   const ComboboxMap& comboboxes() const { return comboboxes_; }
   const TextFieldsMap& text_fields() const { return text_fields_; }
 
  protected:
-  // A very long label will wrap. Value picked so that left + right label
-  // padding bring the label to half-way in the dialog (~225).
-  static constexpr int kMaximumLabelWidth = 192;
-
   virtual std::unique_ptr<views::View> CreateHeaderView();
   virtual std::unique_ptr<views::View> CreateCustomFieldView(
       autofill::ServerFieldType type);
+  virtual std::unique_ptr<views::View> CreateExtraViewForField(

[anthonyvd, 2017/05/11 00:32:14]

nit: add comment

[Mathieu, 2017/05/11 01:16:24]

Done.

+      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.
   virtual bool ValidateModelAndSave() = 0;
   // Creates a ValidationDelegate which knows how to validate for a given
   // |field| definition.
   virtual std::unique_ptr<ValidationDelegate> CreateValidationDelegate(
       const EditorField& field) = 0;
@@ skipping 26 matching lines @@
   // 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.
   // |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);
 
+  // Returns the widest column width of across all extra views of a certain
+  // |size| type.
+  int ComputeWidestExtraViewWidth(EditorField::LengthHint size);
+
   // 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_;
 
   // The first label in the editor, used to set the initial focus.
   views::View* first_field_view_;
 
   // 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_