| 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 bc1c06351ee9ed514c0c2f62b20c4e6cec259a59..71e0cd6e4dc3c4fda72a65b5c4e65d5f1f7d2ec4 100644
|
| --- a/ui/views/controls/button/label_button.cc
|
| +++ b/ui/views/controls/button/label_button.cc
|
| @@ -194,6 +194,17 @@ const char* LabelButton::GetClassName() const {
|
| return kViewClassName;
|
| }
|
|
|
| +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 = style() == STYLE_NATIVE_TEXTBUTTON;
|
| + params->button.classic_state = 0;
|
| + params->button.background_color = GetNativeTheme()->GetSystemColor(
|
| + ui::NativeTheme::kColorId_ButtonBackgroundColor);
|
| +}
|
| +
|
| void LabelButton::ResetColorsFromNativeTheme() {
|
| const ui::NativeTheme* theme = GetNativeTheme();
|
| SkColor colors[STATE_COUNT] = {
|
| @@ -292,7 +303,7 @@ gfx::Rect LabelButton::GetThemePaintRect() const {
|
| ui::NativeTheme::State LabelButton::GetThemeState(
|
| ui::NativeTheme::ExtraParams* params) const {
|
| GetExtraParams(params);
|
| - switch(state()) {
|
| + switch (state()) {
|
| case STATE_NORMAL: return ui::NativeTheme::kNormal;
|
| case STATE_HOVERED: return ui::NativeTheme::kHovered;
|
| case STATE_PRESSED: return ui::NativeTheme::kPressed;
|
| @@ -325,15 +336,4 @@ ui::NativeTheme::State LabelButton::GetForegroundThemeState(
|
| 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 = style() == STYLE_NATIVE_TEXTBUTTON;
|
| - params->button.classic_state = 0;
|
| - params->button.background_color = GetNativeTheme()->GetSystemColor(
|
| - ui::NativeTheme::kColorId_ButtonBackgroundColor);
|
| -}
|
| -
|
| } // namespace views
|
|
|