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

chrome/browser/ui/views/payments/profile_list_view_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/profile_list_view_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_row_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/payments/content/payment_request_spec.h"
 #include "components/payments/content/payment_request_state.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/image_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 {
 
 namespace {
 
 constexpr int kFirstTagValue = static_cast<int>(
     payments::PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX);
 
 enum class PaymentMethodViewControllerTags : int {
@@ skipping 58 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ProfileItem);
 };
 
 // The ProfileListViewController subtype for the Shipping address list
 // screen of the Payment Request flow.
 class ShippingProfileViewController : public ProfileListViewController {
  public:
   ShippingProfileViewController(PaymentRequestSpec* spec,
                                 PaymentRequestState* state,
                                 PaymentRequestDialogView* dialog)
-      : ProfileListViewController(spec, state, dialog) {}
+      : ProfileListViewController(spec, state, dialog) {
+    PopulateList();
+  }
   ~ShippingProfileViewController() override {}
 
  protected:
   // ProfileListViewController:
   std::unique_ptr<views::View> GetLabel(
       autofill::AutofillProfile* profile) override {
     return GetShippingAddressLabel(AddressStyleType::DETAILED,
                                    state()->GetApplicationLocale(), *profile);
   }
 
   void SelectProfile(autofill::AutofillProfile* profile) override {
     state()->SetSelectedShippingProfile(profile);
   }
 
   autofill::AutofillProfile* GetSelectedProfile() override {
     return state()->selected_shipping_profile();
   }
 
   std::vector<autofill::AutofillProfile*> GetProfiles() override {
     return state()->shipping_profiles();
   }
 
-  base::string16 GetHeaderString() override {
+  base::string16 GetSheetTitle() override {
     return GetShippingAddressSectionString(spec()->options().shipping_type);
   }
 
   int GetSecondaryButtonTextId() override {
     return IDS_AUTOFILL_ADD_ADDRESS_CAPTION;
   }
 
   int GetSecondaryButtonTag() override {
     return static_cast<int>(
         PaymentMethodViewControllerTags::ADD_SHIPPING_ADDRESS_BUTTON);
   }
 
   int GetSecondaryButtonViewId() override {
     return static_cast<int>(DialogViewID::PAYMENT_METHOD_ADD_SHIPPING_BUTTON);
   }
 
   void OnSecondaryButtonPressed() override {
     dialog()->ShowShippingAddressEditor();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShippingProfileViewController);
 };
 
 class ContactProfileViewController : public ProfileListViewController {
  public:
   ContactProfileViewController(PaymentRequestSpec* spec,
                                PaymentRequestState* state,
                                PaymentRequestDialogView* dialog)
-      : ProfileListViewController(spec, state, dialog) {}
+      : ProfileListViewController(spec, state, dialog) {
+    PopulateList();
+  }
   ~ContactProfileViewController() override {}
 
  protected:
   // ProfileListViewController:
   std::unique_ptr<views::View> GetLabel(
       autofill::AutofillProfile* profile) override {
     return GetContactInfoLabel(
         AddressStyleType::DETAILED, state()->GetApplicationLocale(), *profile,
         spec()->request_payer_name(), spec()->request_payer_phone(),
         spec()->request_payer_email());
   }
 
   void SelectProfile(autofill::AutofillProfile* profile) override {
     state()->SetSelectedContactProfile(profile);
   }
 
   autofill::AutofillProfile* GetSelectedProfile() override {
     return state()->selected_contact_profile();
   }
 
   std::vector<autofill::AutofillProfile*> GetProfiles() override {
     return state()->contact_profiles();
   }
 
-  base::string16 GetHeaderString() override {
+  base::string16 GetSheetTitle() override {
     return l10n_util::GetStringUTF16(
         IDS_PAYMENT_REQUEST_CONTACT_INFO_SECTION_NAME);
   }
 
   int GetSecondaryButtonTextId() override {
     return IDS_AUTOFILL_ADD_CONTACT_CAPTION;
   }
 
   int GetSecondaryButtonTag() override {
     return static_cast<int>(
@@ skipping 33 matching lines @@
 }
 
 ProfileListViewController::ProfileListViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
     : PaymentRequestSheetController(spec, state, dialog) {}
 
 ProfileListViewController::~ProfileListViewController() {}
 
-std::unique_ptr<views::View> ProfileListViewController::CreateView() {
+void ProfileListViewController::PopulateList() {
   autofill::AutofillProfile* selected_profile = GetSelectedProfile();
 
   // This must be done at Create-time, rather than construct-time, because
   // the subclass method GetProfiles can't be called in the ctor.
   for (auto* profile : GetProfiles()) {
     list_.AddItem(base::MakeUnique<ProfileItem>(profile, spec(), state(),
                                                 &list_, this, dialog(),
                                                 profile == selected_profile));
   }
+}
 
-  return CreatePaymentView(
-      CreateSheetHeaderView(
-          /* show_back_arrow = */ true, GetHeaderString(), this),
-      list_.CreateListView());
+void ProfileListViewController::FillContentView(views::View* content_view) {
+  content_view->SetLayoutManager(new views::FillLayout);
+  content_view->AddChildView(list_.CreateListView().release());
 }
 
 std::unique_ptr<views::View>
 ProfileListViewController::CreateExtraFooterView() {
   std::unique_ptr<views::View> extra_view = base::MakeUnique<views::View>();
 
   extra_view->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kPaymentRequestButtonSpacing));
 
   views::LabelButton* button = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(GetSecondaryButtonTextId()));
   button->set_tag(GetSecondaryButtonTag());
   button->set_id(GetSecondaryButtonViewId());
   extra_view->AddChildView(button);
 
   return extra_view;
 }
 
 void ProfileListViewController::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   if (sender->tag() == GetSecondaryButtonTag())
     OnSecondaryButtonPressed();
   else
     PaymentRequestSheetController::ButtonPressed(sender, event);
 }
 
 }  // namespace payments