Misc. cleanup

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/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 93 matching lines @@
 double IconLabelBubbleView::WidthMultiplier() const {
   return 1.0;
 }
 
 bool IconLabelBubbleView::IsShrinking() const {
   return false;
 }
 
 int IconLabelBubbleView::GetImageAndPaddingWidth() const {
   const int image_width = image_->GetPreferredSize().width();
-  return image_width
-             ? image_width + GetLayoutConstant(ICON_LABEL_VIEW_INTERNAL_PADDING)
-             : 0;
+  return image_width ? (image_width + GetInternalSpacing()) : 0;
 }
 
 gfx::Size IconLabelBubbleView::GetPreferredSize() const {
   // Height will be ignored by the LocationBarView.
   return GetSizeForLabelWidth(label_->GetPreferredSize().width());
 }
 
 void IconLabelBubbleView::Layout() {
   // Compute the label bounds.  The label gets whatever size is left over after
   // accounting for the preferred image width and padding amounts.  Note that if
   // the label has zero size it doesn't actually matter what we compute its X
   // value to be, since it won't be visible, so the X value can be "wrong"
   // compared to where the right edge of the image is computed to be below.
   // This means doing this layout doesn't doesn't depend on any of the layout
   // below.  That layout, however, may need for this layout to have already
   // happened, since the value of ShouldShowBackground() we read below may
   // depend on whether the label has nonzero size.  Therefore, we do this first.
-  const int label_x = GetBubbleOuterPadding(true) + GetImageAndPaddingWidth();
+  const int label_x = GetOuterPadding(true) + GetImageAndPaddingWidth();
   const int label_width =
-      std::max(0, width() - label_x - GetBubbleOuterPadding(false));
+      std::max(0, width() - label_x - GetOuterPadding(false));
   label_->SetBounds(label_x, 0, label_width, height());
 
   // Now compute the image bounds.  In non-MD, the leading padding depends on
   // whether this is an extension icon, since extension icons and
   // Chrome-provided icons are different sizes.  In MD, these sizes are the
   // same, so it's not necessary to handle the two types differently.
   const bool icon_has_enough_padding =
       !is_extension_icon_ || ui::MaterialDesignController::IsModeMaterial();
-  int image_x = GetBubbleOuterPadding(icon_has_enough_padding);
-  const int image_preferred_width = image_->GetPreferredSize().width();
-  int bubble_trailing_padding = GetBubbleOuterPadding(false);
+  int image_x = GetOuterPadding(icon_has_enough_padding);
+  int bubble_trailing_padding = GetOuterPadding(false);
 
   // If ShouldShowBackground() is true, then either we show a background in the
   // steady state, or we're not yet in the last portion of the animation.  In
   // these cases, we leave the leading and trailing padding alone; we don't want
   // to let the image overlap the edge of the background, as this looks glitchy.
   // If this is false, however, then we're only showing the image, and either
   // the view width is the image width, or it's animating downwards and getting
   // close to it.  In these cases, we want to shrink the trailing padding first,
   // so the image slides all the way to the trailing edge before slowing or
   // stopping; then we want to shrink the leading padding down to zero.
+  const int image_preferred_width = image_->GetPreferredSize().width();
   if (!ShouldShowBackground()) {
     image_x = std::min(image_x, width() - image_preferred_width);
     bubble_trailing_padding = std::min(
         bubble_trailing_padding, width() - image_preferred_width - image_x);
   }
 
   // Now that we've computed the padding values, give the image all the
   // remaining width.  This will be less than the image's preferred width during
   // the first portion of the animation; during the very beginning there may not
   // be enough room to show the image at all.
@@ skipping 41 matching lines @@
 
 SkColor IconLabelBubbleView::GetParentBackgroundColor() const {
   return ui::MaterialDesignController::IsModeMaterial()
              ? GetNativeTheme()->GetSystemColor(
                    ui::NativeTheme::kColorId_TextfieldDefaultBackground)
              : parent_background_color_;
 }
 
 gfx::Size IconLabelBubbleView::GetSizeForLabelWidth(int label_width) const {
   gfx::Size size(image_->GetPreferredSize());
-  bool shrinking = IsShrinking();
+  const bool shrinking = IsShrinking();
   // Animation continues for the last few pixels even after the label is not
   // visible in order to slide the icon into its final position. Therefore it
   // is necessary to animate |total_width| even when the background is hidden
   // as long as the animation is still shrinking.
   if (ShouldShowBackground() || shrinking) {
-    const int image_width = size.width();
-    const int padding = GetLayoutConstant(ICON_LABEL_VIEW_INTERNAL_PADDING) +
-                        GetBubbleOuterPadding(true) +
-                        GetBubbleOuterPadding(false);
     // |multiplier| grows from zero to one, stays equal to one and then shrinks
     // to zero again. The view width should correspondingly grow from zero to
     // fully showing both label and icon, stay there, then shrink to just large
     // enough to show the icon. We don't want to shrink all the way back to
     // zero, since this would mean the view would completely disappear and then
     // pop back to an icon after the animation finishes.
-    int total_width = WidthMultiplier() * (label_width + image_width + padding);
-    if (shrinking)
-      total_width = std::max(total_width, image_width);
-    size.set_width(total_width);
+    const int max_width =
+        label_width + MinimumWidthForImageWithBackgroundShown();

[varkha, 2016/03/30 03:03:42]

Don't you need to include GetLayoutConstant(ICON_LABEL_VIEW_INTERNAL_SPACING)
a.k.a. GetInternalSpacing() when both the label and icon are shown?

[Peter Kasting, 2016/03/30 03:56:54]

Yes.  Not sure how I didn't notice this.

+    const int current_width = WidthMultiplier() * max_width;
+    size.set_width(
+        shrinking ? std::max(current_width, size.width()) : current_width);
   }
   return size;
 }
 
-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) +
-         (leading ? 0 : GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING));
+int IconLabelBubbleView::MinimumWidthForImageWithBackgroundShown() const {
+  return GetOuterPadding(true) + image_->GetPreferredSize().width() +
+         GetOuterPadding(false);
 }
 
 void IconLabelBubbleView::SetLabelBackgroundColor(
     SkColor chip_background_color) {
   // The background images are painted atop |parent_background_color_|.
   // Alpha-blend |chip_background_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 |chip_background_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(chip_background_color, 255), GetParentBackgroundColor(),
       SkColorGetA(chip_background_color)));
 }
 
-int IconLabelBubbleView::GetBubbleOuterPaddingMd(bool leading) const {
-  // When the image is empty, leading and trailing padding are equal.
-  if (image_->GetPreferredSize().IsEmpty() || !leading)
+int IconLabelBubbleView::GetOuterPadding(bool leading) const {
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    // Leading and trailing padding are equal.
     return GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING);
+  }
 
-  // Leading padding is 2dp.
-  return 2;
+  return GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING) -
+         GetLayoutConstant(LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING) +
+         (leading ? 0 : GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING));
+}
+
+int IconLabelBubbleView::GetInternalSpacing() const {
+  return GetLayoutConstant(ICON_LABEL_VIEW_INTERNAL_SPACING);
 }
 
 const char* IconLabelBubbleView::GetClassName() const {
   return "IconLabelBubbleView";
 }
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   if (!ShouldShowBackground())
     return;
   if (background_painter_) {
     views::Painter::PaintPainterAt(canvas, background_painter_.get(),
                                    GetContentsBounds());
   }
   if (background())
     background()->Paint(canvas, this);
 }