Add views::Button style enum for LabelButton [native] styling, 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"
@@ skipping 11 matching lines @@
 // The spacing between the icon and text.
 const int kSpacing = 5;
 
 // The length of the hover fade animation.
 const int kHoverAnimationDurationMs = 170;
 
 }  // namespace
 
 namespace views {
 
+// static
+const char LabelButton::kViewClassName[] = "views/LabelButton";
+
 LabelButton::LabelButton(ButtonListener* listener, const string16& text)
     : CustomButton(listener),
       image_(new ImageView()),
       label_(new Label(text)),
       button_state_images_(),
       button_state_colors_(),
       explicitly_set_colors_(),
       is_default_(false),
-      native_theme_(false) {
-  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));
+      style_(STYLE_TEXTBUTTON) {
   SetAnimationDuration(kHoverAnimationDurationMs);
 
   AddChildView(image_);
   image_->set_interactive(false);
 
   AddChildView(label_);
   label_->SetAutoColorReadabilityEnabled(false);
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
-  // Initialize the colors, border, and layout for a Views-themed button.
-  SetNativeTheme(false);
+  // Initialize the colors, border, and layout.
+  SetStyle(style_);
 }
 
 LabelButton::~LabelButton() {}
 
 const gfx::ImageSkia& LabelButton::GetImage(ButtonState for_state) {
   if (for_state != STATE_NORMAL && button_state_images_[for_state].isNull())
     return button_state_images_[STATE_NORMAL];
   return button_state_images_[for_state];
 }
 
@@ skipping 45 matching lines @@
 }
 
 void LabelButton::SetIsDefault(bool is_default) {
   if (is_default == is_default_)
     return;
   is_default_ = is_default;
   ui::Accelerator accel(ui::VKEY_RETURN, ui::EF_NONE);
   is_default_ ? AddAccelerator(accel) : RemoveAccelerator(accel);
 }
 
-void LabelButton::SetNativeTheme(bool native_theme) {
-  native_theme_ = native_theme;
-  LabelButtonBorder* border = new LabelButtonBorder();
-  border->set_native_theme(native_theme);
-  set_border(border);
+void LabelButton::SetStyle(ButtonStyle style) {
+  style_ = style;
+  set_border(new LabelButtonBorder(style));
+  // Inset the button focus rect from the actual border; roughly match Windows.
+  set_focus_border(FocusBorder::CreateDashedFocusBorder(3, 3, 3, 3));
   // Invalidate the layout to pickup the new insets from the border.
   InvalidateLayout();
   ResetColorsFromNativeTheme();
 }
 
 gfx::Size LabelButton::GetPreferredSize() {
   // Resize multi-line labels paired with images to use their available width.
   const gfx::Size image_size(image_->GetPreferredSize());
   if (GetTextMultiLine() && !image_size.IsEmpty() && !GetText().empty() &&
       GetHorizontalAlignment() == gfx::ALIGN_CENTER) {
@@ skipping 13 matching lines @@
   min_size_ = size;
 
   // Return the largest known size clamped to the maximum size (if valid).
   if (max_size_.width() > 0)
     size.set_width(std::min(max_size_.width(), size.width()));
   if (max_size_.height() > 0)
     size.set_height(std::min(max_size_.height(), size.height()));
   return size;
 }
 
+std::string LabelButton::GetClassName() const {
+  return kViewClassName;
+}
+
 void LabelButton::ResetColorsFromNativeTheme() {
   const ui::NativeTheme* theme = GetNativeTheme();
   SkColor colors[STATE_COUNT] = {
     theme->GetSystemColor(ui::NativeTheme::kColorId_TextButtonEnabledColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_TextButtonHoverColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_TextButtonHoverColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_TextButtonDisabledColor),
   };
 #if defined(OS_WIN)
   // Native Windows buttons do not change color on hover or when pressed.
-  if (native_theme_ && theme == ui::NativeThemeWin::instance())
+  if (style() == STYLE_NATIVE_TEXTBUTTON &&
+      theme == ui::NativeThemeWin::instance())
     colors[STATE_HOVERED] = colors[STATE_PRESSED] = colors[STATE_NORMAL];
 #endif
   for (size_t state = STATE_NORMAL; state < STATE_COUNT; ++state) {
     if (!explicitly_set_colors_[state]) {
       SetTextColor(static_cast<ButtonState>(state), colors[state]);
       explicitly_set_colors_[state] = false;
     }
   }
 }
 
@@ skipping 43 matching lines @@
   }
 
   gfx::Point label_origin(child_area.origin());
   if (!image_size.IsEmpty() && GetHorizontalAlignment() != gfx::ALIGN_RIGHT)
     label_origin.set_x(image_origin.x() + image_size.width() + kSpacing);
 
   image_->SetBoundsRect(gfx::Rect(image_origin, image_size));
   label_->SetBoundsRect(gfx::Rect(label_origin, label_size));
 }
 
-std::string LabelButton::GetClassName() const {
-  return "views/LabelButton";
-}
-
 void LabelButton::ChildPreferredSizeChanged(View* child) {
   PreferredSizeChanged();
 }
 
 void LabelButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   ResetColorsFromNativeTheme();
 }
 
 ui::NativeTheme::Part LabelButton::GetThemePart() const {
   return ui::NativeTheme::kPushButton;
@@ skipping 11 matching lines @@
     case STATE_HOVERED:  return ui::NativeTheme::kHovered;
     case STATE_PRESSED:  return ui::NativeTheme::kPressed;
     case STATE_DISABLED: return ui::NativeTheme::kDisabled;
     case STATE_COUNT:    NOTREACHED() << "Unknown state: " << state();
   }
   return ui::NativeTheme::kNormal;
 }
 
 const ui::Animation* LabelButton::GetThemeAnimation() const {
 #if defined(OS_WIN)
-  if (native_theme_ && GetNativeTheme() == ui::NativeThemeWin::instance()) {
+  if (style() == STYLE_NATIVE_TEXTBUTTON &&
+      GetNativeTheme() == ui::NativeThemeWin::instance()) {
     return ui::NativeThemeWin::instance()->IsThemingActive() ?
         hover_animation_.get() : NULL;
   }
 #endif
   return hover_animation_.get();
 }
 
 ui::NativeTheme::State LabelButton::GetBackgroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kNormal;
 }
 
 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 void LabelButton::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
   params->button.checked = false;
   params->button.indeterminate = false;
   params->button.is_default = is_default_;
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
-  params->button.has_border = native_theme();
+  params->button.has_border = style() == STYLE_NATIVE_TEXTBUTTON;
   params->button.classic_state = 0;
   params->button.background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 }  // namespace views