Merge TextButton and LabelButton border images util structs, etc.

ui/views/controls/button/label_button.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/focus_border.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/color_utils.h"
 #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);
 
   AddChildView(image_);
   image_->set_interactive(false);
 
   AddChildView(label_);
   label_->SetAutoColorReadabilityEnabled(false);
   label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
@@ skipping 205 matching lines @@
   params->button.indeterminate = false;
   params->button.is_default = default_button();
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
   params->button.has_border = native_theme();
   params->button.classic_state = 0;
   params->button.background_color = ui::NativeTheme::instance()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 }  // namespace views