[Web Payments] Refactor sheet display to allow updating view content

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"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace payments {
 
 PaymentRequestSheetController::PaymentRequestSheetController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
     : spec_(spec), state_(state), dialog_(dialog) {}
 
+PaymentRequestSheetController::~PaymentRequestSheetController() {}
+
+std::unique_ptr<views::View> PaymentRequestSheetController::CreateView() {
+  content_view_ = base::MakeUnique<views::View>();
+  content_view_->set_owned_by_client();
+  content_view_->SetLayoutManager(new views::FillLayout);
+
+  FillContentView(content_view_.get());
+
+  return CreatePaymentView();
+}
+
+void PaymentRequestSheetController::UpdateContentView() {

[Mathieu, 2017/03/23 11:36:45]

very neat!

[anthonyvd, 2017/03/23 16:18:11]

Thanks!

+  content_view_->RemoveAllChildViews(true);
+  FillContentView(content_view_.get());
+  content_view_->Layout();
+}
+
 std::unique_ptr<views::Button>
 PaymentRequestSheetController::CreatePrimaryButton() {
   return nullptr;
 }
 
+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(
-    std::unique_ptr<views::View> header_view,
-    std::unique_ptr<views::View> content_view) {
+std::unique_ptr<views::View>
+PaymentRequestSheetController::CreatePaymentView() {
   std::unique_ptr<views::View> view = base::MakeUnique<views::View>();
   view->set_background(views::Background::CreateSolidBackground(SK_ColorWHITE));
 
   // Paint the sheets to layers, otherwise the MD buttons (which do paint to a
   // layer) won't do proper clipping.
   view->SetPaintToLayer();
 
   views::GridLayout* layout = new views::GridLayout(view.get());
   view->SetLayoutManager(layout);
 
   // Note: each view is responsible for its own padding (insets).
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                      views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   // |header_view| will be deleted when |view| is.
-  layout->AddView(header_view.release());
+  layout->AddView(
+      CreateSheetHeaderView(ShouldShowHeaderBackArrow(), GetSheetTitle(), this)
+          .release());
 
   layout->StartRow(1, 0);
   // |content_view| will go into a views::ScrollView so it needs to be sized now
   // otherwise it'll be sized to the ScrollView's viewport height, preventing
   // the scroll bar from ever being shown.
-  content_view->SizeToPreferredSize();
+  content_view_->SizeToPreferredSize();
 
   std::unique_ptr<views::ScrollView> scroll =
       base::MakeUnique<views::ScrollView>();
   scroll->EnableViewPortLayer();
   scroll->set_hide_horizontal_scrollbar(true);
-  scroll->SetContents(content_view.release());
+  scroll->SetContents(content_view_.get());
   layout->AddView(scroll.release());
 
   layout->StartRow(0, 0);
   layout->AddView(CreateFooterView().release());
 
   return view;
 }
 
 std::unique_ptr<views::View> PaymentRequestSheetController::CreateFooterView() {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
@@ skipping 37 matching lines @@
       this, l10n_util::GetStringUTF16(IDS_CANCEL));
   button->set_tag(static_cast<int>(PaymentRequestCommonTags::CLOSE_BUTTON_TAG));
   trailing_buttons_container->AddChildView(button);
 
   layout->AddView(trailing_buttons_container.release());
 
   return container;
 }
 
 }  // namespace payments