[Web Payments] Wrap each sheet's content view in a scrollable view.

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/grid_layout.h"
 
 namespace payments {
 
 PaymentRequestSheetController::PaymentRequestSheetController(
     PaymentRequest* request, PaymentRequestDialogView* dialog)
   : request_(request), dialog_(dialog) {
 }
 
@@ skipping 33 matching lines @@
 
   // 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::CENTER,
-                     1, views::GridLayout::USE_PREF, 0, 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->StartRow(0, 0);
-  // |content_view| will be deleted when |view| is.
-  layout->AddView(content_view.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();
 
-  layout->AddPaddingRow(1, 0);
+  std::unique_ptr<views::ScrollView> scroll =
+      base::MakeUnique<views::ScrollView>();
+  scroll->EnableViewPortLayer();
+  scroll->set_hide_horizontal_scrollbar(true);
+  scroll->SetContents(content_view.release());
+  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>();
 
   views::GridLayout* layout = new views::GridLayout(container.get());
@@ skipping 36 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