[Web Payments] Let subsheets define the initial focus

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

 // 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.
 
 #include "chrome/browser/ui/views/payments/editor_view_controller.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
@@ skipping 31 matching lines @@
 };
 
 constexpr int kNumCharactersInShortField = 8;
 constexpr int kNumCharactersInLongField = 20;
 
 }  // namespace
 
 EditorViewController::EditorViewController(PaymentRequestSpec* spec,
                                            PaymentRequestState* state,
                                            PaymentRequestDialogView* dialog)
-    : PaymentRequestSheetController(spec, state, dialog) {}
+    : PaymentRequestSheetController(spec, state, dialog),
+      first_field_view_(nullptr) {}
 
 EditorViewController::~EditorViewController() {}
 
 void EditorViewController::DisplayErrorMessageForField(
     const EditorField& field,
     const base::string16& error_message) {
   const auto& label_it = error_labels_.find(field);
   DCHECK(label_it != error_labels_.end());
   label_it->second->SetText(error_message);
   label_it->second->SchedulePaint();
@@ skipping 62 matching lines @@
     case static_cast<int>(EditorViewControllerTags::SAVE_BUTTON):
       if (ValidateModelAndSave())
         dialog()->GoBackToPaymentSheet();
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
+views::View* EditorViewController::GetFirstFocusedView() {
+  if (first_field_view_)
+    return first_field_view_;
+  return PaymentRequestSheetController::GetFirstFocusedView();
+}
+
 void EditorViewController::ContentsChanged(views::Textfield* sender,
                                            const base::string16& new_contents) {
   static_cast<ValidatingTextfield*>(sender)->OnContentsChanged();
 }
 
 void EditorViewController::OnPerformAction(views::Combobox* sender) {
   static_cast<ValidatingCombobox*>(sender)->OnContentsChanged();
 }
 
 std::unique_ptr<views::View> EditorViewController::CreateEditorView() {
@@ skipping 62 matching lines @@
     text_field->SetText(GetInitialValueForType(field.type));
     text_field->set_controller(this);
     // Using autofill field type as a view ID (for testing).
     text_field->set_id(static_cast<int>(field.type));
     text_field->set_default_width_in_chars(
         field.length_hint == EditorField::LengthHint::HINT_SHORT
             ? kNumCharactersInShortField
             : kNumCharactersInLongField);
 
     text_fields_.insert(std::make_pair(text_field, field));
+
+    if (!first_field_view_)

[Mathieu, 2017/05/04 19:32:34]

TODO(crbug.com/xxxxxx): Should be the first view that's incomplete/empty.

[anthonyvd, 2017/05/04 20:56:59]

Done.

+      first_field_view_ = text_field;
+
     // |text_field| will now be owned by |row|.
     layout->AddView(text_field);
   } else if (field.control_type == EditorField::ControlType::COMBOBOX) {
     ValidatingCombobox* combobox = new ValidatingCombobox(
         GetComboboxModelForType(field.type), CreateValidationDelegate(field));
     combobox->SelectValue(GetInitialValueForType(field.type));
     // Using autofill field type as a view ID (for testing).
     combobox->set_id(static_cast<int>(field.type));
     combobox->set_listener(this);
     comboboxes_.insert(std::make_pair(combobox, field));
+
+    if (!first_field_view_)
+      first_field_view_ = combobox;
+
     // |combobox| will now be owned by |row|.
     layout->AddView(combobox);
   } else {
     NOTREACHED();
   }
 
   // This is the vertical space between the input field and its error label.
   constexpr int kInputErrorLabelPadding = 6;
   layout->StartRowWithPadding(0, 0, 0, kInputErrorLabelPadding);
   layout->SkipColumns(1);
   // Error label is initially empty.
   std::unique_ptr<views::Label> error_label =
       base::MakeUnique<views::Label>(base::ASCIIToUTF16(""));
   error_label->set_id(static_cast<int>(DialogViewID::ERROR_LABEL_OFFSET) +
                       field.type);
   error_label->SetFontList(
       error_label->GetDefaultFontList().DeriveWithSizeDelta(-1));
   error_label->SetEnabledColor(error_label->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_AlertSeverityHigh));
   error_labels_[field] = error_label.get();
 
   layout->AddView(error_label.release());
 }
 
 }  // namespace payments