Parametrize a variety of constants in preparation for changing them in MD.

chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm

 // Copyright 2015 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/frame/browser_non_client_frame_view_mac.h"
 
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
+#include "chrome/browser/ui/views/layout_constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 
 namespace {
 
 // How far to inset the tabstrip from the sides of the window.
 const int kTabstripTopInset = 8;
 const int kTabstripLeftInset = 70;  // Make room for window control buttons.
@@ skipping 118 matching lines @@
 }
 
 void BrowserNonClientFrameViewMac::PaintToolbarBackground(gfx::Canvas* canvas) {
   gfx::Rect bounds(browser_view()->GetToolbarBounds());
   if (bounds.IsEmpty())
     return;
 
   ui::ThemeProvider* tp = GetThemeProvider();
   gfx::ImageSkia* border = tp->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_TOP);
   const int top_inset =
-      BrowserViewLayout::kToolbarTabStripVerticalOverlap - border->height();
+      GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP) - border->height();
 
   const int x = bounds.x();
   const int y = bounds.y() + top_inset;
   const int w = bounds.width();
   const int h = bounds.height() - top_inset;
 
   // The tabstrip border image height is 2*scale pixels, but only the bottom 2
   // pixels contain the actual border (the rest is transparent). We can't draw
   // the toolbar image below this transparent upper area when scale > 1.
   const int fill_y = y + canvas->image_scale() - 1;
   const int fill_height = bounds.bottom() - fill_y;
 
   // Draw the toolbar fill.
   canvas->TileImageInt(*tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR),
                        x + GetThemeBackgroundXInset(), fill_y - GetTopInset(),
                        x, fill_y, w, fill_height);
 
   // Draw the tabstrip/toolbar separator.
   canvas->TileImageInt(*border, 0, 0, x, y, w, border->height());
 
   // Draw the content/toolbar separator.
   canvas->FillRect(
       gfx::Rect(x, y + h - kClientEdgeThickness, w, kClientEdgeThickness),
       ThemeProperties::GetDefaultColor(
           ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
 }