[Payments] Adjust the UI fit the mocks better

chrome/browser/ui/views/payments/payment_request_views_util.cc

 // Copyright 2016 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_views_util.h"
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 70 matching lines @@
 
 namespace payments {
 
 std::unique_ptr<views::View> CreateSheetHeaderView(
     bool show_back_arrow,
     const base::string16& title,
     views::VectorIconButtonDelegate* delegate) {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
   views::GridLayout* layout = new views::GridLayout(container.get());
   container->SetLayoutManager(layout);
-  layout->SetInsets(0, kPaymentRequestRowHorizontalInsets,
-                    0, kPaymentRequestRowHorizontalInsets);
+
+  constexpr int kHeaderTopVerticalInset = 14;
+  constexpr int kHeaderBottomVerticalInset = 8;
+  constexpr int kHeaderHorizontalInset = 16;
+  // Top, left, bottom, right.
+  layout->SetInsets(kHeaderTopVerticalInset, kHeaderHorizontalInset,
+                    kHeaderBottomVerticalInset, kHeaderHorizontalInset);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   // A column for the optional back arrow.
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
+
+  constexpr int kPaddingBetweenArrowAndTitle = 16;
+  if (show_back_arrow)
+    columns->AddPaddingColumn(0, kPaddingBetweenArrowAndTitle);
+
   // A column for the title.
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                      1, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   if (!show_back_arrow) {
     layout->SkipColumns(1);
   } else {
     views::VectorIconButton* back_arrow = new views::VectorIconButton(delegate);
     back_arrow->SetIcon(ui::kBackArrowIcon);
-    back_arrow->SetSize(back_arrow->GetPreferredSize());
+    constexpr int kBackArrowSize = 16;
+    back_arrow->SetSize(gfx::Size(kBackArrowSize, kBackArrowSize));
     back_arrow->set_tag(static_cast<int>(
         PaymentRequestCommonTags::BACK_BUTTON_TAG));
     layout->AddView(back_arrow);
   }
 
   views::Label* title_label = new views::Label(title);
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  title_label->SetFontList(
+      title_label->GetDefaultFontList().DeriveWithSizeDelta(2));
   layout->AddView(title_label);
 
   return container;
 }
 
 std::unique_ptr<views::ImageView> CreateCardIconView(
     const std::string& card_type) {
   std::unique_ptr<views::ImageView> card_icon_view =
       base::MakeUnique<views::ImageView>();
   card_icon_view->set_interactive(false);
@@ skipping 78 matching lines @@
 
 // Creates a views::Border object that can paint the gray horizontal ruler used
 // as a separator between items in the Payment Request dialog.
 std::unique_ptr<views::Border> CreatePaymentRequestRowBorder() {
   return views::CreateBorderPainter(
       base::MakeUnique<PaymentRequestRowBorderPainter>(),
       gfx::Insets());
 }
 
 }  // namespace payments