Fix suggested button margins broken in r219567.

R=estade@chromium.org
BUG=none (yet)
TEST=visual

Review URL: https://chromiumcodereview.appspot.com/23468002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219683 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 2 deletions

diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index ba289bd..9ba8e46 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -1008,7 +1008,10 @@ AutofillDialogViews::SuggestedButton::~SuggestedButton() {}
 
 gfx::Size AutofillDialogViews::SuggestedButton::GetPreferredSize() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return rb.GetImageNamed(ResourceIDForState()).Size();
+  gfx::Size size = rb.GetImageNamed(ResourceIDForState()).Size();
+  const gfx::Insets insets = GetInsets();
+  size.Enlarge(insets.width(), insets.height());
+  return size;
 }
 
 const char* AutofillDialogViews::SuggestedButton::GetClassName() const {
@@ -1019,7 +1022,9 @@ void AutofillDialogViews::SuggestedButton::PaintChildren(gfx::Canvas* canvas) {}
 
 void AutofillDialogViews::SuggestedButton::OnPaint(gfx::Canvas* canvas) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  canvas->DrawImageInt(*rb.GetImageSkiaNamed(ResourceIDForState()), 0, 0);
+  const gfx::Insets insets = GetInsets();
+  canvas->DrawImageInt(*rb.GetImageSkiaNamed(ResourceIDForState()),
+                       insets.left(), insets.top());
 }
 
 int AutofillDialogViews::SuggestedButton::ResourceIDForState() const {
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.h b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
index 978f38f..8a4df2f 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.h
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
@@ -382,6 +382,7 @@ class AutofillDialogViews : public AutofillDialogView,
     DISALLOW_COPY_AND_ASSIGN(SectionContainer);
   };
 
+  // A button to show address or billing suggestions.
   class SuggestedButton : public views::MenuButton {
    public:
     explicit SuggestedButton(views::MenuButtonListener* listener);