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

chrome/browser/ui/libgtk2ui/gtk2_ui.h

Index: chrome/browser/ui/libgtk2ui/gtk2_ui.h
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
index 381e6664f4a553cca9fdfd4d48dbffaafb1d610b..ef6d0ef40f358263f1cf5689659dc3216adc670f 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
@@ -45,7 +45,10 @@ class Gtk2UI : public views::LinuxUI {
     const std::vector<views::FrameButton>& trailing_buttons);
 
   // Draws the GTK button border for state |gtk_state| onto a bitmap.
-  SkBitmap DrawGtkButtonBorder(int gtk_state, int width, int height) const;
+  SkBitmap DrawGtkButtonBorder(int gtk_state,
+                               bool focused,
+                               int width,
+                               int height) const;
 
   // Returns the current insets for a button.
   gfx::Insets GetButtonInsets() const;
@@ -98,8 +101,8 @@ class Gtk2UI : public views::LinuxUI {
   virtual gfx::Image GetIconForContentType(
       const std::string& content_type, int size) const OVERRIDE;
   virtual views::Border* CreateNativeBorder(
-      views::CustomButton* owning_button,
-      views::Border* border) OVERRIDE;
+      views::LabelButton* owning_button,
+      views::LabelButtonBorder* border) OVERRIDE;
   virtual void AddWindowButtonOrderObserver(
       views::WindowButtonOrderObserver* observer) OVERRIDE;
   virtual void RemoveWindowButtonOrderObserver(