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

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

 // Copyright 2016 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_sheet_view_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 176 matching lines @@
   return layout;
 }
 
 }  // namespace
 
 PaymentSheetViewController::PaymentSheetViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
     : PaymentRequestSheetController(spec, state, dialog),
-      container_view_(base::MakeUnique<views::View>()),
       pay_button_(nullptr),
       widest_name_column_view_width_(ComputeWidestNameColumnViewWidth()) {
-  container_view_->set_owned_by_client();
   state->AddObserver(this);
 }
 
 PaymentSheetViewController::~PaymentSheetViewController() {
   state()->RemoveObserver(this);
 }
 
-std::unique_ptr<views::View> PaymentSheetViewController::CreateView() {
-  std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
-  content_view->SetLayoutManager(new views::FillLayout);
-
-  UpdateContentView();
-  content_view->AddChildView(container_view_.get());
-
-  return CreatePaymentView(
-      CreateSheetHeaderView(
-          false,
-          l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_PAYMENT_SHEET_TITLE),
-          this),
-      std::move(content_view));
-}
-
 void PaymentSheetViewController::OnSelectedInformationChanged() {
   UpdatePayButtonState(state()->is_ready_to_pay());
   UpdateContentView();
-  container_view_->Layout();
 }
 
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreatePrimaryButton() {
   std::unique_ptr<views::Button> button(
       views::MdTextButton::CreateSecondaryUiBlueButton(
           this, l10n_util::GetStringUTF16(IDS_PAYMENTS_PAY_BUTTON)));
   button->set_tag(static_cast<int>(PaymentRequestCommonTags::PAY_BUTTON_TAG));
   button->set_id(static_cast<int>(DialogViewID::PAY_BUTTON));
   pay_button_ = button.get();
   UpdatePayButtonState(state()->is_ready_to_pay());
   return button;
 }
 
+bool PaymentSheetViewController::ShouldShowHeaderBackArrow() {
+  return false;
+}
+
+base::string16 PaymentSheetViewController::GetSheetTitle() {
+  return l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_PAYMENT_SHEET_TITLE);
+}
+
+void PaymentSheetViewController::FillContentView(views::View* content_view) {
+  views::GridLayout* layout = new views::GridLayout(content_view);
+  content_view->SetLayoutManager(layout);
+  views::ColumnSet* columns = layout->AddColumnSet(0);
+  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
+                     views::GridLayout::USE_PREF, 0, 0);
+
+  // The shipping address and contact info rows are optional.
+  layout->StartRow(0, 0);
+  layout->AddView(CreatePaymentSheetSummaryRow().release());
+
+  if (spec()->request_shipping()) {
+    layout->StartRow(0, 0);
+    layout->AddView(CreateShippingRow().release());
+    layout->StartRow(0, 0);
+    layout->AddView(CreateShippingOptionRow().release());
+  }
+  layout->StartRow(0, 0);
+  layout->AddView(CreatePaymentMethodRow().release());
+  if (spec()->request_payer_name() || spec()->request_payer_email() ||
+      spec()->request_payer_phone()) {
+    layout->StartRow(0, 0);
+    layout->AddView(CreateContactInfoRow().release());
+  }
+}
+
 // Adds the product logo to the footer.
 // +---------------------------------------------------------+
 // | (•) chrome                               | PAY | CANCEL |
 // +---------------------------------------------------------+
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateExtraFooterView() {
   std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
   views::BoxLayout* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
@@ skipping 45 matching lines @@
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 void PaymentSheetViewController::UpdatePayButtonState(bool enabled) {
   pay_button_->SetEnabled(enabled);
 }
 
-void PaymentSheetViewController::UpdateContentView() {

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

yisss

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

Yeah, this is much cleaner for all sheets!

-  container_view_->RemoveAllChildViews(/*delete_children=*/true);
-  views::GridLayout* layout = new views::GridLayout(container_view_.get());
-  container_view_->SetLayoutManager(layout);
-  views::ColumnSet* columns = layout->AddColumnSet(0);
-  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
-                     views::GridLayout::USE_PREF, 0, 0);
-
-  // The shipping address and contact info rows are optional.
-  layout->StartRow(0, 0);
-  layout->AddView(CreatePaymentSheetSummaryRow().release());
-
-  if (spec()->request_shipping()) {
-    layout->StartRow(0, 0);
-    layout->AddView(CreateShippingRow().release());
-    layout->StartRow(0, 0);
-    layout->AddView(CreateShippingOptionRow().release());
-  }
-  layout->StartRow(0, 0);
-  layout->AddView(CreatePaymentMethodRow().release());
-  if (spec()->request_payer_name() || spec()->request_payer_email() ||
-      spec()->request_payer_phone()) {
-    layout->StartRow(0, 0);
-    layout->AddView(CreateContactInfoRow().release());
-  }
-}
-
 // Creates the Order Summary row, which contains an "Order Summary" label,
 // an inline list of display items, a Total Amount label, and a Chevron.
 // +----------------------------------------------+
 // | Order Summary   Item 1            $ 1.34     |
 // |                 Item 2            $ 2.00   > |
 // |                 2 more items...              |
 // |                 Total         USD $12.34     |
 // +----------------------------------------------+
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreatePaymentSheetSummaryRow() {
@@ skipping 188 matching lines @@
       std::move(option_label), std::unique_ptr<views::View>(nullptr),
       widest_name_column_view_width_);
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_SHIPPING_OPTION_BUTTON));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION));
   return section;
 }
 
 }  // namespace payments