New location security strings and animation.

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 231 matching lines @@
         (widget && widget->GetCompositor()->device_scale_factor() >= 2) ? 0 : 1;
     const int post_label_width = ui::MaterialDesignController::IsModeMaterial()
         ? (kSpaceBesideSeparator + separator_width + GetPostSeparatorPadding())
         : GetOuterPadding(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.
-    const int max_width = GetImageTrailingEdge() + GetInternalSpacing() +
-                          label_width + post_label_width;
-    const int current_width = WidthMultiplier() * max_width;
-    size.set_width(shrinking ? std::max(current_width, size.width())
-                             : current_width);
+    // pop back to an icon after the animation finishes. Thus, while shrinking,
+    // |multiplier| only refers to the label, separator and padding - the only
+    // parts which, in fact, shrink.
+    int current_width;
+    if (shrinking) {
+      current_width = GetImageTrailingEdge() + GetInternalSpacing() +
+                      (label_width + post_label_width) * WidthMultiplier();
+    } else {
+      const int max_width = GetImageTrailingEdge() + GetInternalSpacing() +
+                            label_width + post_label_width;
+      current_width = WidthMultiplier() * max_width;
+    }
+    size.set_width(current_width);

[Peter Kasting, 2016/08/15 23:29:49]

It seems like there are two effects this change has:

(1) The code is longer and more complicated.
(2) We will shrink from (max) to (image width) in the same time we grew from (0)
to (max), instead of shrinking at the same pixel rate (and thus taking a shorter
time to shrink than grow).

Change (2) doesn't seem desirable.  It seems like shrinking at a constant
physical speed instead of over an equal time period is better.

[Kevin Bailey, 2016/08/16 16:39:36]

Done, but see comment in location_icon_view.cc.

   }
   return size;
 }
 
 int IconLabelBubbleView::MinimumWidthForImageWithBackgroundShown() const {
   return GetImageTrailingEdge() + GetOuterPadding(false);
 }
 
 void IconLabelBubbleView::SetLabelBackgroundColor(
     SkColor chip_background_color) {
@@ skipping 61 matching lines @@
     // Draw the 1 px separator.
     gfx::ScopedCanvas scoped_canvas(canvas);
     const float scale = canvas->UndoDeviceScaleFactor();
     // Keep the separator aligned on a pixel center.
     const gfx::RectF pixel_aligned_bounds =
         gfx::ScaleRect(gfx::RectF(bounds), scale) - gfx::Vector2dF(0.5f, 0);
     canvas->DrawLine(pixel_aligned_bounds.top_right(),
                      pixel_aligned_bounds.bottom_right(), separator_color);
   }
 }