Adjusts content bubble animation with respect to icon size

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 34 matching lines @@
   void SetLabel(const base::string16& label);
   void SetImage(const gfx::ImageSkia& image);
   void set_is_extension_icon(bool is_extension_icon) {
     is_extension_icon_ = is_extension_icon;
   }
 
   const views::ImageView* GetImageView() const { return image_; }
   views::ImageView* GetImageView() { return image_; }
 
  protected:
-  views::ImageView* image() { return image_; }
-  views::Label* label() { return label_; }
+  views::ImageView* image() const { return image_; }
+  views::Label* label() const { return label_; }

[Peter Kasting, 2016/03/07 20:24:27]

Don't make these changes, or else make them by adding parallel functions that
return const pointers; const member functions shouldn't return non-const
pointers.

(We violate this in a gazillion places, but don't add more.)

[varkha, 2016/03/08 18:01:04]

Done.

 
   // Gets the color for displaying text.
   virtual SkColor GetTextColor() const = 0;
 
   // Gets the color for the border (a more transparent version of which is used
   // for the background).
   virtual SkColor GetBorderColor() const = 0;
 
   // Returns true when the background should be rendered.
   virtual bool ShouldShowBackground() const;
 
   // Returns a multiplier used to calculate the actual width of the view based
   // on its desired width.  This ranges from 0 for a zero-width view to 1 for a
   // full-width view and can be used to animate the width of the view.
   virtual double WidthMultiplier() const;
 
+  // Stops animation if it is in progress.
+  virtual void StopAnimation();
+
+  // 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;
 
   // views::View:
   gfx::Size GetPreferredSize() const override;
   void Layout() override;
   void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
   void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
   void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
   scoped_ptr<views::InkDropHover> CreateInkDropHover() const override;
   SkColor GetInkDropBaseColor() const override;
 
   const gfx::FontList& font_list() const { return label_->font_list(); }
 
   SkColor GetParentBackgroundColor() const;
 
   gfx::Size GetSizeForLabelWidth(int width) const;
 
+  // Amount of padding at the edges of the bubble.  If |leading| is true, this

[Peter Kasting, 2016/03/07 20:24:27]

Nit: For clarity you might want to be a bit more precise about this padding; for
example, is it the padding from the edge of the icon/label to the outer edge of
the bubble, or does it stop just inside the bubble border, or does it maybe
extend out to include some of the whitespace outside the bubble?

[varkha, 2016/03/08 18:01:03]

Done.

+  // is the padding at the beginning of the bubble (left in LTR), otherwise it's
+  // the end padding.

[Peter Kasting, 2016/03/07 20:24:27]

Nit: end -> trailing

[varkha, 2016/03/08 18:01:04]

Done.

+  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;
 
   // views::View:
   const char* GetClassName() const override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // For painting the background. TODO(estade): remove post MD launch.
   scoped_ptr<views::Painter> background_painter_;
 
   // The contents of the bubble.
   views::ImageView* image_;
   views::Label* label_;
 
   bool is_extension_icon_;
 
   // This is only used in pre-MD. In MD, the background color is derived from
   // the native theme (so it responds to native theme updates). TODO(estade):
   // remove when MD is default.
   SkColor parent_background_color_;
 
   bool should_show_background_;
 
   DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_