Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: ui/views/controls/button/custom_button.cc

Issue 2034893003: Fixed interactive ui test regression (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 62f048173c68b2de35b20602c71f909c42275b17..ecd6ba9e97f9d135e1e78c14627158d3be8df2c6 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -167,14 +167,14 @@ bool CustomButton::OnMouseDragged(const ui::MouseEvent& event) {
if (HitTestPoint(event.location())) {
SetState(ShouldEnterPushedState(event) ? STATE_PRESSED : STATE_HOVERED);
if (!InDrag() && ink_drop_delegate() &&
- ink_drop_delegate()->GetTargetInkDropState() !=
- views::InkDropState::ACTION_PENDING)
+ ink_drop_delegate()->GetTargetInkDropState() ==
+ views::InkDropState::HIDDEN)
ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
} else {
SetState(STATE_NORMAL);
if (!InDrag() && ink_drop_delegate() &&
- ink_drop_delegate()->GetTargetInkDropState() !=
- views::InkDropState::HIDDEN)
+ ink_drop_delegate()->GetTargetInkDropState() ==
+ views::InkDropState::ACTION_PENDING)
ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
}
}
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698