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

chrome/browser/ui/views/payments/payment_method_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/payment_method_view_controller.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.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_state.h"
 #include "components/payments/core/payment_instrument.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/vector_icons.h"
 
 namespace payments {
 
 namespace {
 
 constexpr int kFirstTagValue = static_cast<int>(
     payments::PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX);
 
@@ skipping 85 matching lines @@
     std::unique_ptr<PaymentMethodListItem> item =
         base::MakeUnique<PaymentMethodListItem>(
             instrument.get(), spec, state, &payment_method_list_, dialog,
             instrument.get() == state->selected_instrument());
     payment_method_list_.AddItem(std::move(item));
   }
 }
 
 PaymentMethodViewController::~PaymentMethodViewController() {}
 
-std::unique_ptr<views::View> PaymentMethodViewController::CreateView() {
+base::string16 PaymentMethodViewController::GetSheetTitle() {
+  return l10n_util::GetStringUTF16(
+      IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME);
+}
+
+void PaymentMethodViewController::FillContentView(views::View* content_view) {
+  content_view->SetLayoutManager(new views::FillLayout);
   std::unique_ptr<views::View> list_view =
       payment_method_list_.CreateListView();
   list_view->set_id(
       static_cast<int>(DialogViewID::PAYMENT_METHOD_SHEET_LIST_VIEW));
-  return CreatePaymentView(
-      CreateSheetHeaderView(
-          true,
-          l10n_util::GetStringUTF16(
-              IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME),
-          this),
-      std::move(list_view));
+  content_view->AddChildView(list_view.release());
 }
 
 std::unique_ptr<views::View>
 PaymentMethodViewController::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(
@@ skipping 14 matching lines @@
         PaymentMethodViewControllerTags::ADD_CREDIT_CARD_BUTTON):
       dialog()->ShowCreditCardEditor();
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments