Top Chrome MD cleanup - get rid of most of GetLayoutInsets.

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"
 
@@ skipping 11 matching lines @@
   const int kTabHeight[] = {29, 33};
   const int kTabPinnedContentWidth[] = {23, 23};
   const int kTabstripNewTabButtonOverlap[] = {5, 6};
   const int kTabstripTabOverlap[] = {16, 16};
   const int kToolbarStandardSpacing[] = {4, 8};
   const int kToolbarElementPadding[] = {0, 8};
   const int kToolbarLocationBarRightPadding[] = {4, 8};
 
   const int mode = ui::MaterialDesignController::GetMode();
   switch (constant) {
+    case AVATAR_ICON_PADDING:
+      return 4;
     case FIND_BAR_TOOLBAR_OVERLAP:
       return kFindBarVerticalOffset[mode];
     case LOCATION_BAR_BORDER_THICKNESS:
       return kLocationBarBorderThickness[mode];
     case LOCATION_BAR_BUBBLE_FONT_VERTICAL_PADDING:
       return kLocationBarBubbleFontVerticalPadding[mode];
     case LOCATION_BAR_BUBBLE_VERTICAL_PADDING:
       return kLocationBarBubbleVerticalPadding[mode];
     case LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET:
       if (ui::MaterialDesignController::IsSecondaryUiMaterial())
@@ skipping 10 matching lines @@
     case TABSTRIP_NEW_TAB_BUTTON_OVERLAP:
       return kTabstripNewTabButtonOverlap[mode];
     case TABSTRIP_TAB_OVERLAP:
       return kTabstripTabOverlap[mode];
     case TAB_FAVICON_TITLE_SPACING:
       return kTabFaviconTitleSpacing[mode];
     case TAB_HEIGHT:
       return kTabHeight[mode];
     case TAB_PINNED_CONTENT_WIDTH:
       return kTabPinnedContentWidth[mode];
+    case TOOLBAR_BUTTON_PADDING:
+      return 6;
     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;
 }
 
 gfx::Insets GetLayoutInsets(LayoutInset inset) {
-  const int kAvatarLeftPadding[] = {4, 4};
-  const int kAvatarRightPadding[] = {4, 4};
-  const int kAvatarBottomPadding[] = {4, 4};
-  const int kOmniboxDropdownIconPadding[] = {4, 8};
-  const int kOmniboxDropdownPadding[] = {4, 4};
-  const int kOmniboxDropdownTextPadding[] = {3, 3};
-  const int kTabBottomPadding[] = {1, 1};
-  const int kTabHorizontalPadding[] = {16, 18};
-  const int kTabTopPadding[] = {1, 1};
-  const int kToolbarBottomPadding[] = {5, 5};
-  const int kToolbarButtonPadding[] = {6, 6};
-  const int kToolbarLeftPadding[] = {4, 8};
-  const int kToolbarRightPadding[] = {4, 8};
-  const int kToolbarTopPadding[] = {4, 4};
-
-  const int mode = ui::MaterialDesignController::GetMode();
   switch (inset) {
-    case AVATAR_ICON:
-      return gfx::Insets(0, kAvatarLeftPadding[mode],
-                         kAvatarBottomPadding[mode], kAvatarRightPadding[mode]);
-    case OMNIBOX_DROPDOWN:
-      return gfx::Insets(kOmniboxDropdownPadding[mode], 0);
-    case OMNIBOX_DROPDOWN_ICON:
-      return gfx::Insets(kOmniboxDropdownIconPadding[mode], 0);
-    case OMNIBOX_DROPDOWN_TEXT:
-      return gfx::Insets(kOmniboxDropdownTextPadding[mode], 0);
-    case TAB:
-      return gfx::Insets(kTabTopPadding[mode], kTabHorizontalPadding[mode],
-                         kTabBottomPadding[mode], kTabHorizontalPadding[mode]);
-    case TOOLBAR:
-      return gfx::Insets(kToolbarTopPadding[mode], kToolbarLeftPadding[mode],
-                         kToolbarBottomPadding[mode],
-                         kToolbarRightPadding[mode]);
-    case TOOLBAR_BUTTON:
-      return gfx::Insets(kToolbarButtonPadding[mode]);
+    case TAB: {
+      const bool hybrid = ui::MaterialDesignController::GetMode() ==
+                          ui::MaterialDesignController::MATERIAL_HYBRID;
+      return gfx::Insets(1, hybrid ? 18 : 16);
+    }
   }
   NOTREACHED();
   return gfx::Insets();
 }
 
 gfx::Size GetLayoutSize(LayoutSize size) {
   const int kNewTabButtonWidth[] = {36, 39};
   const int kNewTabButtonHeight[] = {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();
 }