Remove IconLabelView layout constants.

chrome/browser/ui/views/location_bar/icon_label_bubble_view.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/location_bar/icon_label_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 251 matching lines @@
   // against |parent_background_color_| using the original image grid color's
   // alpha. This is because AlphaBlend(a, b, 255) always returns |a| unchanged
   // even if |a| is a color with non-255 alpha.
   label_->SetBackgroundColor(color_utils::AlphaBlend(
       SkColorSetA(chip_background_color, 255), GetParentBackgroundColor(),
       SkColorGetA(chip_background_color)));
 }
 
 int IconLabelBubbleView::GetOuterPadding(bool leading) const {
   if (ui::MaterialDesignController::IsModeMaterial())
-    return GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING);
+    return GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
 
   return GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING) -
          GetLayoutConstant(LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING) +
-         (leading ? 0 : GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING));
+         (leading ? 0 : kTrailingPaddingPreMd);
 }
 
 int IconLabelBubbleView::GetInternalSpacing() const {
   return image_->GetPreferredSize().IsEmpty()
              ? 0
-             : GetLayoutConstant(ICON_LABEL_VIEW_INTERNAL_SPACING);
+             : GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
 }
 
 const char* IconLabelBubbleView::GetClassName() const {
   return "IconLabelBubbleView";
 }
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   if (!ShouldShowBackground())
     return;
   if (background_painter_) {
     views::Painter::PaintPainterAt(canvas, background_painter_.get(),
                                    GetContentsBounds());
   }
 
   // In MD, draw a separator and not a background.
   if (ui::MaterialDesignController::IsModeMaterial()) {
     const SkColor plain_text_color = GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_TextfieldDefaultColor);
     const SkColor separator_color = SkColorSetA(
         plain_text_color, color_utils::IsDark(plain_text_color) ? 0x59 : 0xCC);
 
     // Amount of padding that is built into the whatever view comes after this
     // one in the location bar (e.g. omnibox textfield).
     int post_chip_spacing =
         GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
     // Amount of space to leave after the separator (dp).
     const int kPostSeparatorSpacing =
-        (GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING) +
+        (GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING) +
          kExtraTrailingPadding + post_chip_spacing) /
             2 -
         post_chip_spacing;
     // Height of the separator (dp).
     const int kSeparatorHeight = 16;
     gfx::Rect bounds(GetLocalBounds());
     bounds.Inset(kPostSeparatorSpacing,
                  (bounds.height() - kSeparatorHeight) / 2);
 
     // 1px at all scale factors.
     gfx::ScopedCanvas scoped_canvas(canvas);
     const float scale = canvas->UndoDeviceScaleFactor();
     const gfx::RectF pixel_aligned_bounds =
         gfx::ScaleRect(gfx::RectF(bounds), scale) - gfx::Vector2dF(0.5f, 0);
     canvas->DrawLine(pixel_aligned_bounds.top_right(),
                      pixel_aligned_bounds.bottom_right(), separator_color);
   }
 }