Revert 255091 "linux_aura: Fix all instances of LabelButton sizing."

trunk/src/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 "third_party/skia/include/effects/SkLerpXfermode.h"
@@ skipping 102 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 {
-  return border_->GetInsets();
+  ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
+  if (!provider || !provider->UsingNativeTheme())
+    return border_->GetInsets();
+
+  return gtk2_ui_->GetButtonInsets();
 }
 
 gfx::Size Gtk2Border::GetMinimumSize() const {
   ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
   if (!provider || !provider->UsingNativeTheme())
     return border_->GetMinimumSize();
 
   gfx::Insets insets = GetInsets();
   return gfx::Size(insets.width(), insets.height());
 }
@@ skipping 37 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