linux_aura: Fixes a couple of issues with the button border integration.

chrome/browser/ui/libgtk2ui/gtk2_border.h

Index: chrome/browser/ui/libgtk2ui/gtk2_border.h
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.h b/chrome/browser/ui/libgtk2ui/gtk2_border.h
index 5d789ba7ed6956cbf10d4564321da4c85d872f84..311df82faa7c1218c94cbd9abdc1cbfd098d1e59 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.h
@@ -6,14 +6,17 @@
 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_
 
 #include "ui/gfx/image/image_skia.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/button/button.h"
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
-class CustomButton;
+class LabelButton;
+class LabelButtonBorder;
 }
 
 namespace libgtk2ui {
@@ -23,8 +26,8 @@ class Gtk2UI;
 class Gtk2Border : public views::Border {
  public:
   Gtk2Border(Gtk2UI* gtk2_ui,
-             views::CustomButton* owning_button,
-             views::Border* border);
+             views::LabelButton* owning_button,
+             views::LabelButtonBorder* border);
   virtual ~Gtk2Border();
 
   // Called on theme changes. We invalidate the layout, drop our cached images,
@@ -37,20 +40,24 @@ class Gtk2Border : public views::Border {
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
  private:
+  void PaintState(const ui::NativeTheme::State state,
+                  const ui::NativeTheme::ExtraParams& extra,
+                  const gfx::Rect& rect,
+                  gfx::Canvas* canvas);
+
   Gtk2UI* gtk2_ui_;
   bool use_gtk_;
 
-  gfx::ImageSkia hovered_;
-  gfx::ImageSkia pressed_;
+  gfx::ImageSkia button_images_[2][views::Button::STATE_COUNT];
 
   // The view to which we are a border. We keep track of this so that we can
   // force invalidate the layout on theme changes.
-  views::CustomButton* owning_button_;
+  views::LabelButton* owning_button_;
 
   // Since we don't want to expose the concept of whether we're using a GTK
   // theme down to the cross platform views layer, we keep a normal Border and
   // delegate to it whenever we aren't in GTK theme mode.
-  scoped_ptr<views::Border> border_;
+  scoped_ptr<views::LabelButtonBorder> border_;
 
   DISALLOW_COPY_AND_ASSIGN(Gtk2Border);
 };