| Index: chrome/browser/ui/layout_constants.cc
|
| diff --git a/chrome/browser/ui/layout_constants.cc b/chrome/browser/ui/layout_constants.cc
|
| index cbb124c4db8581a10b31ba10557a5f4b7e171ec4..b4a18ace313bd6bb4619b619714cdcea28feb28a 100644
|
| --- a/chrome/browser/ui/layout_constants.cc
|
| +++ b/chrome/browser/ui/layout_constants.cc
|
| @@ -20,23 +20,17 @@ int GetLayoutConstant(LayoutConstant constant) {
|
| 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};
|
|
|
| @@ -68,22 +62,12 @@ int GetLayoutConstant(LayoutConstant constant) {
|
| 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:
|
|
|