[MD] Twiddle padding of omnibox chips

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

 // Copyright (c) 2012 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/location_bar/icon_label_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
@@ skipping 122 matching lines @@
         (image_width ? (image_width + padding) : 0) +
         GetBubbleOuterPadding(false);
     size = gfx::Size(WidthMultiplier() * (width + non_label_width), 0);
     if (!ui::MaterialDesignController::IsModeMaterial())
       size.SetToMax(background_painter_->GetMinimumSize());
   }
 
   return size;
 }
 
-int IconLabelBubbleView::GetBubbleOuterPadding(bool start) const {
-  // When the image is empty, leading and trailing padding are equal.
-  const int extra_padding =
-      image_->GetPreferredSize().IsEmpty() || !start
-          ? GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING)
-          : 0;
+int IconLabelBubbleView::GetBubbleOuterPadding(bool leading) const {
+  if (ui::MaterialDesignController::IsModeMaterial())
+    return GetBubbleOuterPaddingMd(leading);
+
   return GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING) -
          GetLayoutConstant(LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING) +
-         extra_padding;
+         (leading ? 0 : GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING));
+}
+
+int IconLabelBubbleView::GetBubbleOuterPaddingMd(bool leading) const {
+  // When the image is empty, leading and trailing padding are equal.
+  const bool trailing = image_->GetPreferredSize().IsEmpty() || !leading;
+  return GetLayoutConstant(trailing ? ICON_LABEL_VIEW_TRAILING_PADDING
+                                    : ICON_LABEL_VIEW_LEADING_PADDING);
 }
 
 void IconLabelBubbleView::SetLabelBackgroundColor(
     SkColor background_image_color) {
   // The background images are painted atop |parent_background_color_|.
   // Alpha-blend |background_image_color| with |parent_background_color_| to
   // determine the actual color the label text will sit atop.
   // Tricky bit: We alpha blend an opaque version of |background_image_color|
   // against |parent_background_color_| using the original image grid color's
   // alpha. This is because AlphaBlend(a, b, 255) always returns |a| unchanged
   // even if |a| is a color with non-255 alpha.
   label_->SetBackgroundColor(color_utils::AlphaBlend(
       SkColorSetA(background_image_color, 255), parent_background_color_,
       SkColorGetA(background_image_color)));
 }
 
 const char* IconLabelBubbleView::GetClassName() const {
   return "IconLabelBubbleView";
 }
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   if (!ShouldShowBackground())
     return;
   if (background_painter_)
     background_painter_->Paint(canvas, size());
   if (background())
     background()->Paint(canvas, this);
 }