Commit abff0b84 authored by David Roger's avatar David Roger Committed by Commit Bot

Revert "[Identity Pill] Don't freeze the animation during password bubble"

This reverts commit 896db5d1.

Reason for revert:
as this is intended to be cherry-picked on beta, we want to
minimize risks.
After discussion we decided to go for an even smaller change, to
be extra safe.

Original change's description:
> [Identity Pill] Don't freeze the animation during password bubble
> 
> This CL reverses part of the change introduced in:
> https://chromium-review.googlesource.com/c/chromium/src/+/1826678
> 
> The reason is that we don't want the pill to stay open while the
> password bubble is displayed, as the user may mistakenly believe that
> their password is uploaded to their google account.
> 
> TBR=pbos
> 
> Fixed: 1027112
> Change-Id: I77bbcb8793369579e96597bb6e72be89e852227b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940238
> Commit-Queue: David Roger <droger@chromium.org>
> Reviewed-by: Thomas Tangl <tangltom@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#719949}

TBR=droger@chromium.org,pbos@chromium.org,tangltom@chromium.org

Change-Id: Ice039caa9f1592a629148d0df4de5f92a9dffbc6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1942430Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Commit-Queue: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719967}
parent 125f16a3
......@@ -458,10 +458,11 @@ void AvatarToolbarButton::MaybeHideIdentityAnimation() {
}
// Keep identity visible if this button is in use (hovered or has focus) or
// if |parent_| is in use. We should not move things around when the user
// wants to click on |this| or another button in |parent_|.
// if |parent_| is in use (which makes it highlighted). We should not move
// things around when the user wants to click on |this| or another button in
// |parent_|.
if (this->IsMouseHovered() || this->HasFocus() ||
(parent_ && (parent_->IsMouseHovered() || parent_->HasFocus()))) {
(parent_ && parent_->IsHighlighted())) {
return;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment