Adjusts content bubble animation with respect to icon size

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

Index: chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
index f1a58d69658e70239a52d6c293add91fd8085987..1bf30d82a7bc9493a809673e1aacccf2cbb8d822 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
@@ -54,6 +54,7 @@ class IconLabelBubbleView : public views::InkDropHostView {
  protected:
   views::ImageView* image() { return image_; }
   views::Label* label() { return label_; }
+  const views::Label* label() const { return label_; }
 
   // Gets the color for displaying text.
   virtual SkColor GetTextColor() const = 0;
@@ -70,6 +71,9 @@ class IconLabelBubbleView : public views::InkDropHostView {
   // full-width view and can be used to animate the width of the view.
   virtual double WidthMultiplier() const;
 
+  // Returns true when animation is in progress and is shrinking.
+  virtual bool IsShrinking() const;
+
   // Returns the amount of horizontal space needed to draw the image and its
   // padding before the label.
   virtual int GetImageAndPaddingWidth() const;
@@ -89,16 +93,16 @@ class IconLabelBubbleView : public views::InkDropHostView {
 
   gfx::Size GetSizeForLabelWidth(int width) const;
 
+  // Amount of padding from the edge of the icon / label to the nearest edge of

[Peter Kasting, 2016/03/08 22:07:06]

Nit: nearest -> outer

(Seems slightly clearer to me; it's pretty obvious we'd choose the nearer edge,
but explicitly saying "outer" makes it clear this isn't e.g. the inside edge of
the border).

[varkha, 2016/03/10 22:25:57]

Done.

+  // the bubble view.  If |leading| is true, this is the padding at the
+  // beginning of the bubble (left in LTR), otherwise it's the trailing padding.
+  int GetBubbleOuterPadding(bool leading) const;
+
  private:
   // Sets a background color on |label_| based on |chip_background_color| and
   // the parent's bg color.
   void SetLabelBackgroundColor(SkColor chip_background_color);
 
-  // Amount of padding at the edges of the bubble.  If |leading| is true, this
-  // is the padding at the beginning of the bubble (left in LTR), otherwise it's
-  // the end padding.
-  int GetBubbleOuterPadding(bool leading) const;
-
   // As above, but for Material Design. TODO(estade): remove/replace the above.
   int GetBubbleOuterPaddingMd(bool leading) const;