[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_row_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "components/payments/content/payment_request_spec.h"
@@ skipping 60 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);
   }
 
  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);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContactProfileViewController);
 };
 
 }  // namespace
 
@@ skipping 16 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->AddChildView(list_.CreateListView().release());
 }
 
 }  // namespace payments