Index: views/controls/button/custom_button.cc |
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc |
index 95ecb988c478c34c3b293bdea1bc9afe1e1c8462..dab4e326ec51812e777424a9709d3c109030af70 100644 |
--- a/views/controls/button/custom_button.cc |
+++ b/views/controls/button/custom_button.cc |
@@ -91,11 +91,11 @@ bool CustomButton::IsHotTracked() const { |
return state_ == BS_HOT; |
} |
-void CustomButton::SetEnabled(bool enabled) { |
- if (enabled ? (state_ != BS_DISABLED) : (state_ == BS_DISABLED)) |
+void CustomButton::OnEnabledChanged() { |
+ if (View::IsEnabled() ? (state_ != BS_DISABLED) : (state_ == BS_DISABLED)) |
return; |
- if (enabled) |
+ if (View::IsEnabled()) |
SetState(IsMouseHovered() ? BS_HOT : BS_NORMAL); |
else |
SetState(BS_DISABLED); |
@@ -196,7 +196,7 @@ bool CustomButton::OnKeyReleased(const KeyEvent& event) { |
} |
bool CustomButton::AcceleratorPressed(const Accelerator& accelerator) { |
- if (!enabled_) |
+ if (!View::IsEnabled()) |
return false; |
SetState(BS_NORMAL); |