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

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

Issue 2859193004: Remove GridLayout::SetInsets in favor of an empty border on the host. (Closed)
Patch Set: missed a merge problem 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_request_views_util.cc
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.cc b/chrome/browser/ui/views/payments/payment_request_views_util.cc
index b868c3c87e11cfde8476a4e3ee8204620883cd5e..405c62b5d4df07b05b64293b55473ebafbd11d42 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.cc
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.cc
@@ -195,9 +195,9 @@ std::unique_ptr<views::View> CreateSheetHeaderView(
constexpr int kHeaderTopVerticalInset = 14;
constexpr int kHeaderBottomVerticalInset = 8;
constexpr int kHeaderHorizontalInset = 16;
- // Top, left, bottom, right.
- layout->SetInsets(kHeaderTopVerticalInset, kHeaderHorizontalInset,
- kHeaderBottomVerticalInset, kHeaderHorizontalInset);
+ container->SetBorder(views::CreateEmptyBorder(
+ kHeaderTopVerticalInset, kHeaderHorizontalInset,
+ kHeaderBottomVerticalInset, kHeaderHorizontalInset));
views::ColumnSet* columns = layout->AddColumnSet(0);
// A column for the optional back arrow.
@@ -345,9 +345,11 @@ std::unique_ptr<views::View> GetContactInfoLabel(
return base_label;
}
-std::unique_ptr<views::Border> CreatePaymentRequestRowBorder(SkColor color) {
+std::unique_ptr<views::Border> CreatePaymentRequestRowBorder(
+ SkColor color,
+ const gfx::Insets& insets) {
return views::CreateBorderPainter(
- base::MakeUnique<PaymentRequestRowBorderPainter>(color), gfx::Insets());
+ base::MakeUnique<PaymentRequestRowBorderPainter>(color), insets);
}
std::unique_ptr<views::Label> CreateBoldLabel(const base::string16& text) {

Powered by Google App Engine
This is Rietveld 408576698