Last round of cleaning up MD layout constants.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
index 36ed8cc08c272fe1e76b9f185a4963b8b033fb19..385ad2eb23b91f83fc8ac3e6eb173fe8b2974e34 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
@@ -107,7 +107,7 @@ void OpaqueBrowserFrameViewLayout::SetButtonOrdering(
 gfx::Rect OpaqueBrowserFrameViewLayout::GetBoundsForTabStrip(
     const gfx::Size& tabstrip_preferred_size,
     int available_width) const {
-  int x = leading_button_start_ + GetLayoutConstant(AVATAR_ICON_PADDING);
+  int x = leading_button_start_ + OpaqueBrowserFrameView::kAvatarIconPadding;
   available_width -= x + NewTabCaptionSpacing() + trailing_button_start_;
   return gfx::Rect(x, GetTabStripInsetsTop(false), std::max(0, available_width),
                    tabstrip_preferred_size.height());
@@ -369,7 +369,7 @@ void OpaqueBrowserFrameViewLayout::LayoutIncognitoIcon(views::View* host) {
   trailing_button_start_ = std::max(trailing_button_start_, min_button_width);
 
   if (incognito_icon_) {
-    const int pad = GetLayoutConstant(AVATAR_ICON_PADDING);
+    const int pad = OpaqueBrowserFrameView::kAvatarIconPadding;

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

Nit: Make constexpr?

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

Done.

     const gfx::Size size(delegate_->GetIncognitoAvatarIcon().size());
     const int incognito_width = pad + size.width();
     int x;