Focus first invalid field of payment request editor

chrome/browser/ui/views/payments/payment_request_sheet_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/payment_request_sheet_controller.h"
 
+#include <utility>
+
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "components/payments/content/payment_request.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/focus/focus_search.h"
@@ skipping 157 matching lines @@
   UpdateContentView();
 
   view->SetFirstFocusableView(GetFirstFocusedView());
   return std::move(view);
 }
 
 void PaymentRequestSheetController::UpdateContentView() {
   content_view_->RemoveAllChildViews(true);
   FillContentView(content_view_);
   RelayoutPane();
+  DialogViewID sheet_id;
+  if (GetSheetId(&sheet_id)) {

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

Some views probably don't want this to happen here. Can we extract it into
another function? I'm thinking about something like:

void UpdateFocus(views::View* v) {
  DialogViewID sheet_id;
  if (GetSheetId(&sheet_id)) {
    SheetView* sheet_view = static_cast<SheetView*>(
        dialog()->GetViewByID(static_cast<int>(sheet_id)));
    // This will be null on first call since it's not been set until CreateView
    // returns, and the first call to UpdateContentView comes from CreateView.
    if (sheet_view) {
      sheet_view->SetFirstFocusableView(v);
      dialog()->RequestFocus();
    }
  }
}

and then have editors call it with GetFirstFocusedView() as the argument after
they call UpdateContentView.

This will also make it reusable when we implement post update focus restoration.
WDYT?

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

Done.

+    SheetView* sheet_view = static_cast<SheetView*>(
+        dialog()->GetViewByID(static_cast<int>(sheet_id)));
+    // This will be null on first call since it's not been set until CreateView
+    // returns, and the first call to UpdateContentView comes from CreateView.
+    if (sheet_view) {
+      sheet_view->SetFirstFocusableView(GetFirstFocusedView());
+      dialog()->RequestFocus();
+    }
+  }
 }
 
 void PaymentRequestSheetController::RelayoutPane() {
   content_view_->Layout();
   pane_->SizeToPreferredSize();
   // Now that the content and its surrounding pane are updated, force a Layout
   // on the ScrollView so that it updates its scroll bars now.
   scroll_->Layout();
 }
 
@@ skipping 99 matching lines @@
 
 bool PaymentRequestSheetController::PerformPrimaryButtonAction() {
   if (primary_button_ && primary_button_->enabled()) {
     ButtonPressed(primary_button_.get(), DummyEvent());
     return true;
   }
   return false;
 }
 
 }  // namespace payments