Misc. cleanup

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 75 matching lines @@
   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 label_width) const;
 
-  // Amount of padding from the edge of the icon / label to the outer edge of
-  // 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;
+  // Returns the minimum width the view can be to show the complete image when
+  // the background is showing.
+  int MinimumWidthForImageWithBackgroundShown() 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);
 
-  // As above, but for Material Design. TODO(estade): remove/replace the above.
-  int GetBubbleOuterPaddingMd(bool leading) const;
+  // Amount of padding from the leading edge of the view to the leading edge of
+  // the image (if |leading| is true), or from the trailing edge of the label
+  // (or image, if the label is invisible) to the trailing edge of the view.
+  int GetOuterPadding(bool leading) const;
+
+  // Spacing between the image and the label.
+  int GetInternalSpacing() 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_