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

Unified Diff: chrome/browser/ui/views/payments/cvc_unmask_view_controller.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/cvc_unmask_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc b/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc
index 4821c727b7e2e487c2c3d0888a78508c0d8eba90..1c7183a007ace3330f28069902535ec5e6a858d4 100644
--- a/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc
+++ b/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc
@@ -26,6 +26,7 @@
#include "content/public/browser/web_contents.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/views/border.h"
#include "ui/views/controls/button/md_text_button.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/layout/fill_layout.h"
@@ -123,9 +124,9 @@ base::string16 CvcUnmaskViewController::GetSheetTitle() {
void CvcUnmaskViewController::FillContentView(views::View* content_view) {
std::unique_ptr<views::GridLayout> layout =
base::MakeUnique<views::GridLayout>(content_view);
- layout->SetInsets(
+ content_view->SetBorder(views::CreateEmptyBorder(
kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
- kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets);
+ kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets));
views::ColumnSet* instructions_columns = layout->AddColumnSet(0);
instructions_columns->AddColumn(views::GridLayout::Alignment::LEADING,
« no previous file with comments | « chrome/browser/ui/views/first_run_bubble.cc ('k') | chrome/browser/ui/views/payments/editor_view_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698