| 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 11fbbcde1c5ccda74420d9c0a93dbdcfdf357695..d9db86712a2f3cb67838a6a55559459ef6a73ac0 100644
|
| --- a/ui/views/controls/button/custom_button.cc
|
| +++ b/ui/views/controls/button/custom_button.cc
|
| @@ -273,7 +273,10 @@ void CustomButton::ShowContextMenu(const gfx::Point& p,
|
| }
|
|
|
| void CustomButton::OnDragDone() {
|
| - SetState(STATE_NORMAL);
|
| + // Only reset the state to normal if the button isn't currently disabled
|
| + // (since disabled buttons may still be able to be dragged).
|
| + if (state_ != STATE_DISABLED)
|
| + SetState(STATE_NORMAL);
|
| }
|
|
|
| void CustomButton::GetAccessibleState(ui::AXViewState* state) {
|
|
|