Index: ui/views/controls/button/custom_button.cc |
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc |
index 7eb75ef95e9fe66eebf27b43c6fa22a9fe7fce5a..d46ad121dd4c99b273a618a23bad1fc459e54470 100644 |
--- a/ui/views/controls/button/custom_button.cc |
+++ b/ui/views/controls/button/custom_button.cc |
@@ -94,19 +94,15 @@ bool CustomButton::IsHotTracked() const { |
} |
void CustomButton::OnEnabledChanged() { |
- if (View::IsEnabled() ? (state_ != BS_DISABLED) : (state_ == BS_DISABLED)) |
+ if (enabled() ? (state_ != BS_DISABLED) : (state_ == BS_DISABLED)) |
return; |
- if (View::IsEnabled()) |
+ if (enabled()) |
SetState(IsMouseHovered() ? BS_HOT : BS_NORMAL); |
else |
SetState(BS_DISABLED); |
} |
-bool CustomButton::IsEnabled() const { |
- return state_ != BS_DISABLED; |
-} |
- |
std::string CustomButton::GetClassName() const { |
return kViewClassName; |
} |
@@ -198,7 +194,7 @@ bool CustomButton::OnKeyReleased(const KeyEvent& event) { |
} |
bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) { |
- if (!View::IsEnabled()) |
+ if (!enabled()) |
return false; |
SetState(BS_NORMAL); |