Misc. cleanup

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 kIconLabelViewInternalPadding[] = {3, 2, 2};
+  const int kIconLabelViewInternalSpacing[] = {3, 2, 2};
   const int kIconLabelViewTrailingPadding[] = {2, 3, 3};
   const int kLocationBarBorderThickness[] = {2, 1, 1};
   const int kLocationBarBubbleFontVerticalPadding[] = {1, 2, 4};
   const int kLocationBarBubbleHorizontalPadding[] = {1, 4, 4};
   const int kLocationBarBubbleVerticalPadding[] = {1, 3, 3};
   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};
@@ skipping 15 matching lines @@
   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 ICON_LABEL_VIEW_INTERNAL_PADDING:
-      return kIconLabelViewInternalPadding[mode];
+    case ICON_LABEL_VIEW_INTERNAL_SPACING:
+      return kIconLabelViewInternalSpacing[mode];
     case ICON_LABEL_VIEW_TRAILING_PADDING:
       return kIconLabelViewTrailingPadding[mode];
     case LOCATION_BAR_BORDER_THICKNESS:
       return kLocationBarBorderThickness[mode];
     case LOCATION_BAR_BUBBLE_FONT_VERTICAL_PADDING:
       return kLocationBarBubbleFontVerticalPadding[mode];
     case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING:
       return kLocationBarBubbleHorizontalPadding[mode];
     case LOCATION_BAR_BUBBLE_VERTICAL_PADDING:
       return kLocationBarBubbleVerticalPadding[mode];
@@ skipping 85 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();
 }