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

ui/views/linux_ui/linux_ui.h

Index: ui/views/linux_ui/linux_ui.h
diff --git a/ui/views/linux_ui/linux_ui.h b/ui/views/linux_ui/linux_ui.h
index 2ae847f4f9574a932e7b20b8dd93c06cfb7807cd..0cd659349244b2d5bcc3a18e2af202d838acea70 100644
--- a/ui/views/linux_ui/linux_ui.h
+++ b/ui/views/linux_ui/linux_ui.h
@@ -25,8 +25,8 @@ class NativeTheme;
 }
 
 namespace views {
-class Border;
-class CustomButton;
+class LabelButton;
+class LabelButtonBorder;
 class View;
 class WindowButtonOrderObserver;
 
@@ -103,8 +103,8 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
 
   // Builds a Border which paints the native button style.
   virtual Border* CreateNativeBorder(
-      views::CustomButton* owning_button,
-      views::Border* border) = 0;
+      views::LabelButton* owning_button,
+      views::LabelButtonBorder* border) = 0;
 
   // Notifies the observer about changes about how window buttons should be
   // laid out. If the order is anything other than the default min,max,close on