[Web Payments] Let subsheets define the initial focus

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 "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"
@@ skipping 89 matching lines @@
 
 PaymentRequestSheetController::PaymentRequestSheetController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
     : spec_(spec), state_(state), dialog_(dialog) {}
 
 PaymentRequestSheetController::~PaymentRequestSheetController() {}
 
 std::unique_ptr<views::View> PaymentRequestSheetController::CreateView() {
-  std::unique_ptr<views::View> view = CreatePaymentView();
-  UpdateContentView();
-  return view;
-}
-
-void PaymentRequestSheetController::UpdateContentView() {
-  content_view_->RemoveAllChildViews(true);
-  FillContentView(content_view_);
-  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();
-}
-
-std::unique_ptr<views::Button>
-PaymentRequestSheetController::CreatePrimaryButton() {
-  return nullptr;
-}
-
-base::string16 PaymentRequestSheetController::GetSecondaryButtonLabel() {
-  return l10n_util::GetStringUTF16(IDS_CANCEL);
-}
-
-bool PaymentRequestSheetController::ShouldShowHeaderBackArrow() {
-  return true;
-}
-
-std::unique_ptr<views::View>
-PaymentRequestSheetController::CreateExtraFooterView() {
-  return nullptr;
-}
-
-void PaymentRequestSheetController::ButtonPressed(
-    views::Button* sender, const ui::Event& event) {
-  switch (static_cast<PaymentRequestCommonTags>(sender->tag())) {
-    case PaymentRequestCommonTags::CLOSE_BUTTON_TAG:
-      dialog()->CloseDialog();
-      break;
-    case PaymentRequestCommonTags::BACK_BUTTON_TAG:
-      dialog()->GoBack();
-      break;
-    case PaymentRequestCommonTags::PAY_BUTTON_TAG:
-      dialog()->Pay();
-      break;
-    case PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX:
-      NOTREACHED();
-      break;
-  }
-}
-
-std::unique_ptr<views::View>
-PaymentRequestSheetController::CreatePaymentView() {
   // Create the footer now so that it's known if there's a primary button or not
   // before creating the sheet view. This way, it's possible to determine
   // whether there's something to do when the user hits enter.
   std::unique_ptr<views::View> footer = CreateFooterView();
   std::unique_ptr<SheetView> view = base::MakeUnique<SheetView>(
       primary_button_
           ? base::Bind(
                 &PaymentRequestSheetController::PerformPrimaryButtonAction,
                 base::Unretained(this))
           : base::Callback<bool()>());
@@ skipping 43 matching lines @@
   scroll_ = base::MakeUnique<views::ScrollView>();
   scroll_->set_owned_by_client();
   scroll_->EnableViewPortLayer();
   scroll_->set_hide_horizontal_scrollbar(true);
   scroll_->SetContents(pane_);
   layout->AddView(scroll_.get());
 
   layout->StartRow(0, 0);
   layout->AddView(footer.release());
 
+  UpdateContentView();
+
   view->SetFirstFocusableView(GetFirstFocusedView());
+  return std::move(view);
+}
 
-  return std::move(view);
+void PaymentRequestSheetController::UpdateContentView() {
+  content_view_->RemoveAllChildViews(true);
+  FillContentView(content_view_);
+  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();
+}
+
+std::unique_ptr<views::Button>
+PaymentRequestSheetController::CreatePrimaryButton() {
+  return nullptr;
+}
+
+base::string16 PaymentRequestSheetController::GetSecondaryButtonLabel() {
+  return l10n_util::GetStringUTF16(IDS_CANCEL);
+}
+
+bool PaymentRequestSheetController::ShouldShowHeaderBackArrow() {
+  return true;
+}
+
+std::unique_ptr<views::View>
+PaymentRequestSheetController::CreateExtraFooterView() {
+  return nullptr;
+}
+
+void PaymentRequestSheetController::ButtonPressed(views::Button* sender,
+                                                  const ui::Event& event) {
+  switch (static_cast<PaymentRequestCommonTags>(sender->tag())) {
+    case PaymentRequestCommonTags::CLOSE_BUTTON_TAG:
+      dialog()->CloseDialog();
+      break;
+    case PaymentRequestCommonTags::BACK_BUTTON_TAG:
+      dialog()->GoBack();
+      break;
+    case PaymentRequestCommonTags::PAY_BUTTON_TAG:
+      dialog()->Pay();
+      break;
+    case PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX:
+      NOTREACHED();
+      break;
+  }
 }
 
 std::unique_ptr<views::View> PaymentRequestSheetController::CreateFooterView() {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
 
   views::GridLayout* layout = new views::GridLayout(container.get());
   container->SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
@@ skipping 58 matching lines @@
 
 bool PaymentRequestSheetController::PerformPrimaryButtonAction() {
   if (primary_button_ && primary_button_->enabled()) {
     ButtonPressed(primary_button_.get(), DummyEvent());
     return true;
   }
   return false;
 }
 
 }  // namespace payments