Focus first invalid field of payment request 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 91 matching lines @@
   // |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:
   // Create a header view to be inserted before all fields.
   virtual std::unique_ptr<views::View> CreateHeaderView();
-  // Create a custom view for the specified |type|.
+  // |focusable_field| is to be set with a pointer to the view that should get
+  // default focus without the custom view.
   virtual std::unique_ptr<views::View> CreateCustomFieldView(
-      autofill::ServerFieldType type);
+      autofill::ServerFieldType type,
+      views::View** focusable_field);
   // 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 28 matching lines @@
   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.
   // |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);
+  // added (see implementation). Returns a pointer to a view filled with a valid
+  // field value that could receive the initial focus if not invalid value is

[anthonyvd, 2017/05/12 14:19:44]

I'm not sure what this means? Does it return any valid field if there's no
invalid one?

[MAD, 2017/05/18 16:01:45]

Rephrased. Better?

[anthonyvd, 2017/05/18 18:12:24]

Yep, thanks!

+  // found.
+  views::View* 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.
+  // The first, potentially invalid, field in the editor, used to set the 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_