Replace layout constants in chrome/browser/ui/views/infobars.

chrome/browser/ui/views/infobars/confirm_infobar.cc

 // Copyright (c) 2012 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/infobars/confirm_infobar.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/views/elevation_icon_setter.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
-#include "ui/views/layout/layout_constants.h"
-
-namespace {
-
-constexpr int kButtonButtonSpacing = views::kRelatedButtonHSpacing;
-constexpr int kEndOfLabelSpacing = views::kItemLabelSpacing;
-
-}  // namespace
 
 // InfoBarService -------------------------------------------------------------
 
 std::unique_ptr<infobars::InfoBar> InfoBarService::CreateConfirmInfoBar(
     std::unique_ptr<ConfirmInfoBarDelegate> delegate) {
   return base::MakeUnique<ConfirmInfoBar>(std::move(delegate));
 }
 
 
 // ConfirmInfoBar -------------------------------------------------------------
@@ skipping 18 matching lines @@
   InfoBarView::Layout();
 
   int x = StartX();
   Labels labels;
   labels.push_back(label_);
   labels.push_back(link_);
   AssignWidths(&labels, std::max(0, EndX() - x - NonLabelWidth()));
 
   label_->SetPosition(gfx::Point(x, OffsetY(label_)));
   if (!label_->text().empty())
-    x = label_->bounds().right() + kEndOfLabelSpacing;
+    x = label_->bounds().right() +
+        ChromeLayoutProvider::Get()->GetDistanceMetric(

[Peter Kasting, 2017/04/14 07:42:32]

Nit: Pull layout provider out to a temp for reuse (all places in both files
where we use it multiple times in one function)

[ananta, 2017/04/14 18:32:33]

Done.

+            DISTANCE_RELATED_LABEL_HORIZONTAL);
 
   if (ok_button_) {
     ok_button_->SetPosition(gfx::Point(x, OffsetY(ok_button_)));
-    x = ok_button_->bounds().right() + kButtonButtonSpacing;
+    x = ok_button_->bounds().right() +
+        ChromeLayoutProvider::Get()->GetDistanceMetric(
+            views::DISTANCE_RELATED_BUTTON_HORIZONTAL);
   }
 
   if (cancel_button_)
     cancel_button_->SetPosition(gfx::Point(x, OffsetY(cancel_button_)));
 
   link_->SetPosition(gfx::Point(EndX() - link_->width(), OffsetY(link_)));
 }
 
 void ConfirmInfoBar::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
@@ skipping 64 matching lines @@
   DCHECK_EQ(link_, source);
   if (GetDelegate()->LinkClicked(ui::DispositionFromEventFlags(event_flags)))
     RemoveSelf();
 }
 
 ConfirmInfoBarDelegate* ConfirmInfoBar::GetDelegate() {
   return delegate()->AsConfirmInfoBarDelegate();
 }
 
 int ConfirmInfoBar::NonLabelWidth() const {
-  int width = (label_->text().empty() || (!ok_button_ && !cancel_button_)) ?
-      0 : kEndOfLabelSpacing;
+  int related_label_horizontal_spacing =

[Peter Kasting, 2017/04/14 07:42:32]

Nit: Try for a shorter name if it's still readable, e.g. |label_spacing|.  These
could also optionally be const.  (all places in both files)

[ananta, 2017/04/14 18:32:33]

Done.

+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          DISTANCE_RELATED_LABEL_HORIZONTAL);
+  int related_button_horizontal_spacing =
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          views::DISTANCE_RELATED_BUTTON_HORIZONTAL);
+  int width = (label_->text().empty() || (!ok_button_ && !cancel_button_))
+                  ? 0
+                  : related_label_horizontal_spacing;
   if (ok_button_)
-    width += ok_button_->width() + (cancel_button_ ? kButtonButtonSpacing : 0);
+    width += ok_button_->width() +
+             (cancel_button_ ? related_button_horizontal_spacing : 0);
   width += cancel_button_ ? cancel_button_->width() : 0;
-  return width + ((link_->text().empty() || !width) ? 0 : kEndOfLabelSpacing);
+  return width + ((link_->text().empty() || !width)
+                      ? 0
+                      : related_label_horizontal_spacing);
 }