[Web Payments] Layout sheets after the width of their parent is known

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_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "components/payments/content/payment_request.h"
@@ skipping 10 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() {
-  // This is owned by its parent.
-  content_view_ = new views::View;
-
-  FillContentView(content_view_);
-
-  return CreatePaymentView();
+  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();
 }
 
 std::unique_ptr<views::Button>
@@ skipping 60 matching lines @@
   // otherwise it'll be sized to the ScrollView's viewport height, preventing
   // the scroll bar from ever being shown.
   pane_ = new views::View;
   views::GridLayout* pane_layout = new views::GridLayout(pane_);
   views::ColumnSet* pane_columns = pane_layout->AddColumnSet(0);
   pane_columns->AddColumn(
       views::GridLayout::Alignment::FILL, views::GridLayout::Alignment::LEADING,
       0, views::GridLayout::SizeType::FIXED, kDialogWidth, kDialogWidth);
   pane_->SetLayoutManager(pane_layout);
   pane_layout->StartRow(0, 0);
+  // This is owned by its parent. It's the container passed to FillContentView.
+  content_view_ = new views::View;
   pane_layout->AddView(content_view_);
   pane_->SizeToPreferredSize();
 
   std::unique_ptr<views::ScrollView> scroll =
       base::MakeUnique<views::ScrollView>();
   scroll->EnableViewPortLayer();
   scroll->set_hide_horizontal_scrollbar(true);
   scroll->SetContents(pane_);
   layout->AddView(scroll.release());
 
@@ skipping 46 matching lines @@
   button->set_tag(static_cast<int>(PaymentRequestCommonTags::CLOSE_BUTTON_TAG));
   button->set_id(static_cast<int>(DialogViewID::CANCEL_BUTTON));
   trailing_buttons_container->AddChildView(button);
 
   layout->AddView(trailing_buttons_container.release());
 
   return container;
 }
 
 }  // namespace payments