Parametrize some more constants that will be changing in MD.

chrome/browser/ui/views/layout_constants.cc

 // 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/layout_constants.h"
 
 #include "base/logging.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 
 int GetLayoutConstant(LayoutConstant constant) {
   const int kIconLabelViewInternalPadding[] = {3, 2, 2};
   const int kIconLabelViewTrailingPadding[] = {2, 8, 8};
   const int kLocationBarBubbleHorizontalPadding[] = {1, 5, 5};
   const int kLocationBarBubbleVerticalPadding[] = {1, 5, 5};
   const int kLocationBarHeight[] = {0, 28, 32};
   const int kLocationBarHorizontalPadding[] = {3, 6, 6};
   const int kLocationBarVerticalPadding[] = {2, 2, 2};
+  const int kNewTabButtonWidth[] = {34, 34, 34};
   const int kOmniboxDropdownBorderInterior[] = {6, 0, 0};
   const int kOmniboxFontPixelSize[] = {16, 14, 14};
   const int kTabCloseButtonTrailingPaddingOverlap[] = {2, 2, 2};
   const int kTabFaviconTitleSpacing[] = {4, 4, 4};
   const int kTabMaximumTitleWidth[] = {175, 175, 175};
   const int kTabPinnedContentWidth[] = {25, 25, 25};
 #if defined(OS_MACOSX)
+  const int kTabstripNewTabButtonOverlap[] = {8, 8, 8};
   const int kTabstripTabOverlap[] = {19, 19, 19};
 #else
+  const int kTabstripNewTabButtonOverlap[] = {11, 11, 11};
   const int kTabstripTabOverlap[] = {26, 26, 26};
 #endif
   const int kTabstripToolbarOverlap[] = {3, 3, 3};
   const int kToolbarContentShadowHeight[] = {0, 0, 0};
   const int kToolbarContentShadowHeightAsh[] = {2, 0, 0};
   const int kToolbarElementPadding[] = {0, 0, 8};
   const int kToolbarLocationBarRightPadding[] = {0, 4, 8};
   const int kToolbarStandardSpacing[] = {3, 4, 8};
 
   const int mode = ui::MaterialDesignController::GetMode();
   switch (constant) {
     case ICON_LABEL_VIEW_INTERNAL_PADDING:
       return kIconLabelViewInternalPadding[mode];
     case ICON_LABEL_VIEW_TRAILING_PADDING:
       return kIconLabelViewTrailingPadding[mode];
     case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING:
       return kLocationBarBubbleHorizontalPadding[mode];
     case LOCATION_BAR_BUBBLE_VERTICAL_PADDING:
       return kLocationBarBubbleVerticalPadding[mode];
     case LOCATION_BAR_HEIGHT:
       return kLocationBarHeight[mode];
     case LOCATION_BAR_HORIZONTAL_PADDING:
       return kLocationBarHorizontalPadding[mode];
     case LOCATION_BAR_VERTICAL_PADDING:
       return kLocationBarVerticalPadding[mode];
+    case NEW_TAB_BUTTON_WIDTH:
+      return kNewTabButtonWidth[mode];
     case OMNIBOX_DROPDOWN_BORDER_INTERIOR:
       return kOmniboxDropdownBorderInterior[mode];
     case OMNIBOX_FONT_PIXEL_SIZE:
       return kOmniboxFontPixelSize[mode];
+    case TABSTRIP_NEW_TAB_BUTTON_OVERLAP:
+      return kTabstripNewTabButtonOverlap[mode];
     case TABSTRIP_TAB_OVERLAP:
       return kTabstripTabOverlap[mode];
     case TABSTRIP_TOOLBAR_OVERLAP:
       return kTabstripToolbarOverlap[mode];
     case TAB_CLOSE_BUTTON_TRAILING_PADDING_OVERLAP:
       return kTabCloseButtonTrailingPaddingOverlap[mode];
     case TAB_FAVICON_TITLE_SPACING:
       return kTabFaviconTitleSpacing[mode];
     case TAB_MAXIMUM_TITLE_WIDTH:
       return kTabMaximumTitleWidth[mode];
@@ skipping 52 matching lines @@
                          kToolbarBottomPadding[mode],
                          kToolbarRightPadding[mode]);
     case TOOLBAR_BUTTON: {
       const int inset = kToolbarButtonPadding[mode];
       return gfx::Insets(inset, inset, inset, inset);
     }
   }
   NOTREACHED();
   return gfx::Insets();
 }