Fix padding in location bar bubbles to match specs on bug.

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 56 matching lines @@
   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;
 
   // 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(); }
@@ skipping 19 matching lines @@
   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_;
 
+  // How much horizontal padding (fully-transparent columns) is inside the
+  // image.  These are subtracted from the desired padding values when
+  // calculating the padding around the image, so that the image always appears
+  // to have the same visible padding no matter what its composition is.  Only
+  // used in MD.
+  int builtin_leading_padding_;
+  int builtin_trailing_padding_;
+
   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_