Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1593)

Unified Diff: chrome/browser/ui/views/payments/payment_sheet_view_controller.cc

Issue 2859193004: Remove GridLayout::SetInsets in favor of an empty border on the host. (Closed)
Patch Set: edits Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
index e7a026788ccc98fdc2a0522550e88c6665686b55..3024cabd2c3282a4a9c466544ecaddabdf468c83 100644
--- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
@@ -39,6 +39,7 @@
#include "ui/gfx/range/range.h"
#include "ui/gfx/text_elider.h"
#include "ui/gfx/text_utils.h"
+#include "ui/views/border.h"
#include "ui/views/controls/button/md_text_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
@@ -154,14 +155,14 @@ std::unique_ptr<views::Button> CreatePaymentSheetRow(
std::unique_ptr<PaymentRequestRowView> row =
base::MakeUnique<PaymentRequestRowView>(listener, clickable);
views::GridLayout* layout = new views::GridLayout(row.get());
+ row->SetLayoutManager(layout);
- // The rows have extra inset compared to the header so that their right edge
+ // The rows have extra padding compared to the header so that their right edge
// lines up with the close button's X rather than its invisible right edge.
- layout->SetInsets(
+ row->SetBorder(views::CreateEmptyBorder(
kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
kPaymentRequestRowVerticalInsets,
- kPaymentRequestRowHorizontalInsets + kPaymentRequestRowExtraRightInset);
- row->SetLayoutManager(layout);
+ kPaymentRequestRowHorizontalInsets + kPaymentRequestRowExtraRightInset));
views::ColumnSet* columns = layout->AddColumnSet(0);
// A column for the section name.

Powered by Google App Engine
This is Rietveld 408576698