Remove some pre-MD code from toolbar/tabstrip/frame.

chrome/browser/ui/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/layout_constants.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
 
 int GetLayoutConstant(LayoutConstant constant) {
   const int kFindBarVerticalOffset[] = {1, 6, 6};
   const int kLocationBarBorderThickness[] = {2, 1, 1};
   const int kLocationBarBubbleFontVerticalPadding[] = {1, 2, 4};
   const int kLocationBarBubbleHorizontalPadding[] = {1, 0, 0};
   const int kLocationBarBubbleVerticalPadding[] = {1, 3, 3};
   const int kLocationBarBubbleAnchorVerticalInset[] = {5, 6, 8};
   const int kLocationBarHeight[] = {27, 28, 32};
   const int kLocationBarHorizontalPadding[] = {3, 6, 6};
   const int kLocationBarVerticalPadding[] = {0, 1, 1};
   const int kOmniboxDropdownBorderInterior[] = {6, 0, 0};
   const int kOmniboxFontPixelSize[] = {16, 14, 14};
-  const int kTabCloseButtonTrailingPaddingOverlap[] = {2, 0, 0};
   const int kTabFaviconTitleSpacing[] = {4, 6, 6};
   const int kTabHeight[] = {29, 29, 33};
   const int kTabPinnedContentWidth[] = {25, 23, 23};
 #if defined(OS_MACOSX)
-  const int kTabTopExclusionHeight[] = {0, 0, 0};
   const int kTabstripNewTabButtonOverlap[] = {8, 5, 6};
   const int kTabstripTabOverlap[] = {19, 16, 16};
 #else
-  const int kTabTopExclusionHeight[] = {2, 0, 0};
   const int kTabstripNewTabButtonOverlap[] = {11, 5, 6};
   const int kTabstripTabOverlap[] = {26, 16, 16};
 #endif
   const int kToolbarStandardSpacing[] = {3, 4, 8};
-  const int kTabstripToolbarOverlap[] = {3, 0, 0};
-  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 mode = ui::MaterialDesignController::GetMode();
   switch (constant) {
     case FIND_BAR_TOOLBAR_OVERLAP:
       return kFindBarVerticalOffset[mode];
     case LOCATION_BAR_BORDER_THICKNESS:
       return kLocationBarBorderThickness[mode];
     case LOCATION_BAR_BUBBLE_FONT_VERTICAL_PADDING:
@@ skipping 11 matching lines @@
     case LOCATION_BAR_VERTICAL_PADDING:
       return kLocationBarVerticalPadding[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_HEIGHT:
       return kTabHeight[mode];
     case TAB_PINNED_CONTENT_WIDTH:
       return kTabPinnedContentWidth[mode];
-    case TAB_TOP_EXCLUSION_HEIGHT:
-      return kTabTopExclusionHeight[mode];
-    case TOOLBAR_CONTENT_SHADOW_HEIGHT:
-      return kToolbarContentShadowHeight[mode];
-    case TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH:
-      return kToolbarContentShadowHeightAsh[mode];
     case TOOLBAR_ELEMENT_PADDING:
       return kToolbarElementPadding[mode];
     case TOOLBAR_LOCATION_BAR_RIGHT_PADDING:
       return kToolbarLocationBarRightPadding[mode];
     case TOOLBAR_STANDARD_SPACING:
       return kToolbarStandardSpacing[mode];
   }
   NOTREACHED();
   return 0;
 }
@@ skipping 44 matching lines @@
   const int kNewTabButtonHeight[] = {18, 18, 21};
 
   const int mode = ui::MaterialDesignController::GetMode();
   switch (size) {
     case NEW_TAB_BUTTON:
       return gfx::Size(kNewTabButtonWidth[mode], kNewTabButtonHeight[mode]);
   }
   NOTREACHED();
   return gfx::Size();
 }