Chromium Code Reviews| Index: chrome/browser/ui/views/payments/payment_request_sheet_controller.cc |
| diff --git a/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc b/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc |
| index 09c3050f2273b4a414334e1ce0aaf83c76642dce..ae91215f09ee2bb51e8c6f6153afc309f29297e2 100644 |
| --- a/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc |
| +++ b/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc |
| @@ -25,6 +25,10 @@ PaymentRequestSheetController::CreatePrimaryButton() { |
| return nullptr; |
| } |
| +std::unique_ptr<views::View> PaymentRequestSheetController::CreateExtraView() { |
| + return nullptr; |
| +} |
| + |
| void PaymentRequestSheetController::ButtonPressed( |
| views::Button* sender, const ui::Event& event) { |
| switch (static_cast<PaymentRequestCommonTags>(sender->tag())) { |
| @@ -86,25 +90,19 @@ std::unique_ptr<views::View> PaymentRequestSheetController::CreateFooterView() { |
| columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, |
| 0, views::GridLayout::USE_PREF, 0, 0); |
| - // The horizontal distance between the right/left edges of the dialog and the |
| - // elements. |
| - constexpr int kFooterHorizontalInset = 16; |
| - // The vertical distance between footer elements and the top/bottom border |
| - // (the bottom border is the edge of the dialog). |
| - constexpr int kFooterVerticalInset = 16; |
| - layout->SetInsets(kFooterVerticalInset, kFooterHorizontalInset, |
|
Mathieu
2017/02/23 00:39:07
also I don't think this should be removed, since i
|
| - kFooterVerticalInset, kFooterHorizontalInset); |
| - |
| layout->StartRow(0, 0); |
| - |
| - layout->AddView(CreateLeadingFooterView().release()); |
|
Mathieu
2017/02/22 23:00:32
This accidentally removed The leading footer view,
|
| + std::unique_ptr<views::View> extra_view = CreateExtraView(); |
| + if (extra_view) |
| + layout->AddView(extra_view.release()); |
| + else |
| + layout->SkipColumns(1); |
| std::unique_ptr<views::View> trailing_buttons_container = |
| base::MakeUnique<views::View>(); |
| - constexpr int kButtonSpacing = 10; |
| trailing_buttons_container->SetLayoutManager(new views::BoxLayout( |
| - views::BoxLayout::kHorizontal, 0, 0, kButtonSpacing)); |
| + views::BoxLayout::kHorizontal, kPaymentRequestRowHorizontalInsets, |
| + kPaymentRequestRowVerticalInsets, kPaymentRequestButtonSpacing)); |
| std::unique_ptr<views::Button> primary_button = CreatePrimaryButton(); |
| if (primary_button) |