Material Hybrid mode for tabstrip.

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 "ui/base/resource/material_design/material_design_controller.h"
 
 int GetLayoutConstant(LayoutConstant constant) {
   const int kFindBarVerticalOffset[] = {1, 6, 6};
   const int kIconLabelViewInternalPadding[] = {3, 2, 2};
   const int kIconLabelViewTrailingPadding[] = {2, 8, 8};
   const int kLocationBarBorderThickness[] = {2, 1, 1};
   const int kLocationBarBubbleHorizontalPadding[] = {1, 4, 4};
   const int kLocationBarBubbleVerticalPadding[] = {1, 4, 4};
   const int kLocationBarHeight[] = {27, 28, 32};
   const int kLocationBarHorizontalPadding[] = {3, 6, 6};
   const int kLocationBarVerticalPadding[] = {2, 2, 2};
   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, 29};
+  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, 5};
+  const int kTabstripNewTabButtonOverlap[] = {8, 5, 6};
   const int kTabstripTabOverlap[] = {19, 16, 16};
 #else
   const int kTabTopExclusionHeight[] = {2, 0, 0};
-  const int kTabstripNewTabButtonOverlap[] = {11, 5, 5};
+  const int kTabstripNewTabButtonOverlap[] = {11, 5, 6};
   const int kTabstripTabOverlap[] = {26, 16, 16};
 #endif
   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 kToolbarStandardSpacing[] = {3, 4, 8};
 
   const int mode = ui::MaterialDesignController::GetMode();
@@ skipping 52 matching lines @@
 }
 
 gfx::Insets GetLayoutInsets(LayoutInset inset) {
   const int kAvatarLeftPadding[] = {2, 4, 4};
   const int kAvatarRightPadding[] = {-6, 4, 4};
   const int kAvatarBottomPadding[] = {2, 4, 4};
   const int kOmniboxDropdownIconPadding[] = {2, 4, 8};
   const int kOmniboxDropdownPadding[] = {3, 4, 4};
   const int kOmniboxDropdownTextPadding[] = {3, 3, 3};
   const int kTabBottomPadding[] = {2, 1, 1};
-  const int kTabLeftPadding[] = {20, 16, 16};
-  const int kTabRightPadding[] = {20, 16, 16};
+  const int kTabLeftPadding[] = {20, 16, 18};
+  const int kTabRightPadding[] = {20, 16, 18};
   const int kTabTopPadding[] = {4, 1, 1};
   const int kToolbarBottomPadding[] = {5, 5, 5};
   const int kToolbarButtonPadding[] = {2, 6, 6};
   const int kToolbarLeftPadding[] = {3, 4, 8};
   const int kToolbarRightPadding[] = {2, 4, 8};
   const int kToolbarTopPadding[] = {5, 4, 4};
 
   const int mode = ui::MaterialDesignController::GetMode();
   switch (inset) {
     case AVATAR_ICON:
@@ skipping 21 matching lines @@
     case TOOLBAR_BUTTON: {
       const int inset = kToolbarButtonPadding[mode];
       return gfx::Insets(inset, inset, inset, inset);
     }
   }
   NOTREACHED();
   return gfx::Insets();
 }
 
 gfx::Size GetLayoutSize(LayoutSize size) {
-  const int kNewTabButtonWidth[] = {34, 36, 36};
-  const int kNewTabButtonHeight[] = {18, 18, 18};
+  const int kNewTabButtonWidth[] = {34, 36, 39};
+  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();
 }