[Autofill Views] Replace 24px with a more semantic constant.

In fixing crbug.com/876291, a constant was introduced to ensure
the primary and secondary text doest not run together.

Replace this fetched from |chrome_layout_provider.h|.

Bug: 876364
Change-Id: I1273b706c05a722d95954f5bde3adb0787833bf9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1646686Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Tommy Martino <tmartino@chromium.org>
Reviewed-by: Fabio Tirelo <ftirelo@chromium.org>
Commit-Queue: Fabio Tirelo <ftirelo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#669688}

chrome/browser/ui/views/autofill/autofill_popup_base_view.h

@@ -32,10 +32,6 @@ class AutofillPopupBaseView : public views::WidgetDelegateView,
   // doesn't look too close to the element.
   static const int kElementBorderPadding = 1;
 
-  // Horizontal spacing between value and description in the row.
-  // TODO(crbug.com/876364): Replace this with a global constant.
-  static const int kValueLabelPadding = 24;
-
   static int GetCornerRadius();
 
   // Get colors used throughout various popup UIs, based on the current native

chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc

@@ -646,8 +646,10 @@ void AutofillPopupFooterView::CreateContent() {
 
   auto value_label = CreateValueLabel();
   AddChildView(std::move(value_label));
-  AddSpacerWithSize(AutofillPopupBaseView::kValueLabelPadding,
-                    /*resize=*/true, layout_manager);
+  AddSpacerWithSize(
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          DISTANCE_BETWEEN_PRIMARY_AND_SECONDARY_LABELS_HORIZONTAL),
+      /*resize=*/true, layout_manager);
 
   if (!icon.isNull() && !use_leading_icon) {
     AddSpacerWithSize(GetHorizontalMargin(), /*resize=*/false, layout_manager);

chrome/browser/ui/views/chrome_layout_provider.cc

@@ -163,6 +163,8 @@ int ChromeLayoutProvider::GetDistanceMetric(int metric) const {
       return kMediumSnapPoint;
     case DISTANCE_LARGE_MODAL_DIALOG_PREFERRED_WIDTH:
       return kLargeSnapPoint;
+    case DISTANCE_BETWEEN_PRIMARY_AND_SECONDARY_LABELS_HORIZONTAL:
+      return 24;
     default:
       return LayoutProvider::GetDistanceMetric(metric);
   }

chrome/browser/ui/views/chrome_layout_provider.h

@@ -69,6 +69,8 @@ enum ChromeDistanceMetric {
   // Width of a bubble unless the content is too wide to make that
   // feasible.
   DISTANCE_BUBBLE_PREFERRED_WIDTH,
+  // Horizontal spacing between value and description in the row.
+  DISTANCE_BETWEEN_PRIMARY_AND_SECONDARY_LABELS_HORIZONTAL
 };
 
 class ChromeLayoutProvider : public views::LayoutProvider {

chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc

@@ -83,8 +83,10 @@ class PasswordGenerationPopupViewViews::GeneratedPasswordBox
     column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                           0 /* resize_percent */, views::GridLayout::USE_PREF,
                           0, 0);
-    column_set->AddPaddingColumn(0 /* resize_percent */,
-                                 AutofillPopupBaseView::kValueLabelPadding);
+    column_set->AddPaddingColumn(
+        0 /* resize_percent */,
+        ChromeLayoutProvider::Get()->GetDistanceMetric(
+            DISTANCE_BETWEEN_PRIMARY_AND_SECONDARY_LABELS_HORIZONTAL));
     column_set->AddColumn(views::GridLayout::TRAILING,
                           views::GridLayout::CENTER, 1.0 /* resize_percent */,
                           views::GridLayout::USE_PREF, 0, 0);