Last round of cleaning up MD 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 "chrome/browser/ui/layout_constants.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 17 matching lines @@
 
   if (elide_in_middle)
     label_->SetElideBehavior(gfx::ELIDE_MIDDLE);
   AddChildView(label_);
 
   // Bubbles are given the full internal height of the location bar so that all
   // child views in the location bar have the same height. The visible height of
   // the bubble should be smaller, so use an empty border to shrink down the
   // content bounds so the background gets painted correctly.
   SetBorder(views::CreateEmptyBorder(
-      gfx::Insets(GetLayoutConstant(LOCATION_BAR_BUBBLE_VERTICAL_PADDING), 0)));
+      gfx::Insets(LocationBarView::kBubbleVerticalPadding, 0)));
 
   // Flip the canvas in RTL so the separator is drawn on the correct side.
   EnableCanvasFlippingForRTLUI(true);
 }
 
 IconLabelBubbleView::~IconLabelBubbleView() {
 }
 
 void IconLabelBubbleView::SetLabel(const base::string16& label) {
   label_->SetText(label);
@@ skipping 31 matching lines @@
 }
 
 bool IconLabelBubbleView::OnKeyReleased(const ui::KeyEvent& event) {
   if (event.key_code() == ui::VKEY_SPACE)
     return OnActivate(event);
   return false;
 }
 
 void IconLabelBubbleView::Layout() {
   // Compute the image bounds. Leading and trailing padding are the same.
-  int image_x = GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
+  int image_x = LocationBarView::kHorizontalPadding;
   int bubble_trailing_padding = image_x;
 
   // If ShouldShowLabel() is true, then either we show a label in the
   // steady state, or we're not yet in the last portion of the animation.  In
   // these cases, we leave the leading and trailing padding alone.  If this is
   // false, however, then we're only showing the image, and either the view
   // width is the image width, or it's animating downwards and getting close to
   // it.  In these cases, we want to shrink the trailing padding first, so the
   // image slides all the way to the trailing edge before slowing or stopping;
   // then we want to shrink the leading padding down to zero.
@@ skipping 77 matching lines @@
     const int separator_width = (GetScaleFactor() >= 2) ? 0 : 1;
     const int post_label_width =
         (kSpaceBesideSeparator + separator_width + GetPostSeparatorPadding());
 
     // |multiplier| grows from zero to one, stays equal to one and then shrinks
     // to zero again. The view width should correspondingly grow from zero to
     // fully showing both label and icon, stay there, then shrink to just large
     // enough to show the icon. We don't want to shrink all the way back to
     // zero, since this would mean the view would completely disappear and then
     // pop back to an icon after the animation finishes.
-    const int max_width = GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING) +
+    const int max_width = LocationBarView::kHorizontalPadding +
                           image_->GetPreferredSize().width() +
                           GetInternalSpacing() + label_width + post_label_width;
     const int current_width = WidthMultiplier() * max_width;
     size.set_width(shrinking ? std::max(current_width, size.width())
                              : current_width);
   }
   return size;
 }
 
 int IconLabelBubbleView::GetInternalSpacing() const {
   return image_->GetPreferredSize().IsEmpty()
              ? 0
-             : GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
+             : LocationBarView::kHorizontalPadding;
 }
 
 int IconLabelBubbleView::GetPostSeparatorPadding() const {
   // The location bar will add LOCATION_BAR_HORIZONTAL_PADDING after us.

[Peter Kasting, 2016/12/08 20:57:49]

Nit: Update comment

[Evan Stade, 2016/12/13 01:31:17]

Done.

-  return kSpaceBesideSeparator -
-         GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
+  return kSpaceBesideSeparator - LocationBarView::kHorizontalPadding;
 }
 
 float IconLabelBubbleView::GetScaleFactor() const {
   const views::Widget* widget = GetWidget();
   // There may be no widget in tests, and in ash there may be no compositor if
   // the native view of the Widget doesn't have a parent.
   const ui::Compositor* compositor = widget ? widget->GetCompositor() : nullptr;
   return compositor ? compositor->device_scale_factor() : 1.0f;
 }
 
@@ skipping 17 matching lines @@
 
   // Draw the 1 px separator.
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float scale = canvas->UndoDeviceScaleFactor();
   // Keep the separator aligned on a pixel center.
   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);
 }