linux_aura: Fix the insets on LabelButtons.

chrome/browser/ui/libgtk2ui/gtk2_border.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_border.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
@@ skipping 54 matching lines @@
   const GtkStateType state_;
   const bool focused_;
   const gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(ButtonImageSkiaSource);
 };
 
 }  // namespace
 
 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui,
-                       views::LabelButton* owning_button)
+                       views::LabelButton* owning_button,
+                       scoped_ptr<views::Border> border)
     : gtk2_ui_(gtk2_ui),
       owning_button_(owning_button),
+      border_(border.Pass()),
       observer_manager_(this) {
   observer_manager_.Add(NativeThemeGtk2::instance());
 }
 
 Gtk2Border::~Gtk2Border() {
 }
 
 void Gtk2Border::Paint(const views::View& view, gfx::Canvas* canvas) {
   DCHECK_EQ(&view, owning_button_);
   const NativeThemeDelegate* native_theme_delegate = owning_button_;
@@ skipping 18 matching lines @@
     PaintState(state, extra, rect, canvas);
     canvas->sk_canvas()->restore();
 
     canvas->sk_canvas()->restore();
   } else {
     PaintState(state, extra, rect, canvas);
   }
 }
 
 gfx::Insets Gtk2Border::GetInsets() const {
-  // On STYLE_TEXTUBTTON, we want the smaller insets so we can fit the GTK icon
-  // in the toolbar without cutting off the edges of the GTK image.
-  return gtk2_ui_->GetButtonInsets();
+  return border_->GetInsets();
 }
 
 gfx::Size Gtk2Border::GetMinimumSize() const {
-  gfx::Insets insets = GetInsets();
-  return gfx::Size(insets.width(), insets.height());
+  return border_->GetMinimumSize();
 }
 
 void Gtk2Border::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
   DCHECK_EQ(observed_theme, NativeThemeGtk2::instance());
   for (int i = 0; i < kNumberOfFocusedStates; ++i) {
     for (int j = 0; j < views::Button::STATE_COUNT; ++j) {
       button_images_[i][j] = gfx::ImageSkia();
     }
   }
 
@@ skipping 29 matching lines @@
     return true;
   } else if (owning_button_->style() == Button::STYLE_TEXTBUTTON) {
     return focused == false && (state == Button::STATE_HOVERED ||
                                 state == Button::STATE_PRESSED);
   }
 
   return false;
 }
 
 }  // namespace libgtk2ui