[MD] Twiddle padding of omnibox chips

chrome/browser/ui/views/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/views/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};
+  // The -1 means the label and the icon will overlap by a pixel.
+  const int kIconLabelViewInternalPadding[] = {3, -1, -1};
+  // Unused pre-MD.
+  const int kIconLabelViewLeadingPadding[] = {-99, 2, 2};

[Peter Kasting, 2015/11/07 02:36:21]

If this isn't used pre-MD, then don't use LayoutConstants for it; define a
constant in IconLabelBubbleView::GetBubbleOuterPaddingMd() instead.

[Evan Stade, 2015/11/07 03:10:12]

Done.

   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[] = {0, 28, 32};
   const int kLocationBarHorizontalPadding[] = {3, 6, 6};
   const int kLocationBarVerticalPadding[] = {2, 2, 2};
   const int kNewTabButtonWidth[] = {34, 34, 34};
   const int kOmniboxDropdownBorderInterior[] = {6, 0, 0};
   const int kOmniboxFontPixelSize[] = {16, 14, 14};
@@ skipping 16 matching lines @@
   const int kToolbarElementPadding[] = {0, 0, 8};
   const int kToolbarLocationBarRightPadding[] = {0, 4, 8};
   const int kToolbarStandardSpacing[] = {3, 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_LEADING_PADDING:
+      return kIconLabelViewLeadingPadding[mode];
     case ICON_LABEL_VIEW_TRAILING_PADDING:
       return kIconLabelViewTrailingPadding[mode];
     case LOCATION_BAR_BORDER_THICKNESS:
       return kLocationBarBorderThickness[mode];
     case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING:
       return kLocationBarBubbleHorizontalPadding[mode];
     case LOCATION_BAR_BUBBLE_VERTICAL_PADDING:
       return kLocationBarBubbleVerticalPadding[mode];
     case LOCATION_BAR_HEIGHT:
       return kLocationBarHeight[mode];
@@ skipping 81 matching lines @@
                          kToolbarBottomPadding[mode],
                          kToolbarRightPadding[mode]);
     case TOOLBAR_BUTTON: {
       const int inset = kToolbarButtonPadding[mode];
       return gfx::Insets(inset, inset, inset, inset);
     }
   }
   NOTREACHED();
   return gfx::Insets();
 }