Merge TextButton and LabelButton border images util structs, etc.

ui/views/controls/button/label_button.cc

Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index d2c6a3e2c344650506fc9f40e1a33ad3d18ba01e..caf64ec33291e707c48a1b0c8d250f1e218b0dd3 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -16,25 +16,25 @@
 #include "ui/base/native_theme/native_theme_win.h"
 #endif
 
-namespace views {
-
 namespace {
 
 // The spacing between the icon and text.
-static const int kSpacing = 5;
+const int kSpacing = 5;
 
 // The length of the hover fade animation.
-static const int kHoverAnimationDurationMs = 170;
+const int kHoverAnimationDurationMs = 170;
 
 }  // namespace
 
+namespace views {
+
 LabelButton::LabelButton(ButtonListener* listener, const string16& text)
     : CustomButton(listener),
       image_(new ImageView()),
       label_(new Label(text)),
       default_button_(false),
       native_theme_(false) {
-  set_border(new LabelButtonBorder(this));
+  set_border(new LabelButtonBorder());
   // Inset the button focus rect from the actual border; roughly match Windows.
   set_focus_border(FocusBorder::CreateDashedFocusBorder(3, 3, 3, 3));
   SetAnimationDuration(kHoverAnimationDurationMs);