| 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 85dc33627b1d853aebe03296affa86e9b96f3618..2d78b6b17ad08d100fde4bb99a469d6a1b0fb5ed 100644
|
| --- a/ui/views/controls/button/custom_button.cc
|
| +++ b/ui/views/controls/button/custom_button.cc
|
| @@ -470,8 +470,13 @@ void CustomButton::NotifyClick(const ui::Event& event) {
|
| }
|
|
|
| void CustomButton::OnClickCanceled(const ui::Event& event) {
|
| - AnimateInkDrop(views::InkDropState::HIDDEN,
|
| - ui::LocatedEvent::FromIfValid(&event));
|
| + if (ink_drop()->GetTargetInkDropState() ==
|
| + views::InkDropState::ACTION_PENDING ||
|
| + ink_drop()->GetTargetInkDropState() ==
|
| + views::InkDropState::ALTERNATE_ACTION_PENDING) {
|
| + AnimateInkDrop(views::InkDropState::HIDDEN,
|
| + ui::LocatedEvent::FromIfValid(&event));
|
| + }
|
| Button::OnClickCanceled(event);
|
| }
|
|
|
|
|