Commit 2d036de9 authored by David Roger's avatar David Roger Committed by Commit Bot

[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, tangltom

Fixed: 1027112
Change-Id: I7bdbc4a2020ba3511f2379a737146e7b61458551
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1942332
Commit-Queue: David Roger <droger@chromium.org>
Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719991}
parent 2bdb7de9
...@@ -457,14 +457,10 @@ void AvatarToolbarButton::MaybeHideIdentityAnimation() { ...@@ -457,14 +457,10 @@ void AvatarToolbarButton::MaybeHideIdentityAnimation() {
return; return;
} }
// Keep identity visible if this button is in use (hovered or has focus) or // Keep identity visible if this button is in use (hovered or has focus). We
// if |parent_| is in use (which makes it highlighted). We should not move // should not move things around when the user wants to click on |this|.
// things around when the user wants to click on |this| or another button in if (this->IsMouseHovered() || this->HasFocus())
// |parent_|.
if (this->IsMouseHovered() || this->HasFocus() ||
(parent_ && parent_->IsHighlighted())) {
return; return;
}
identity_animation_state_ = IdentityAnimationState::kNotShowing; identity_animation_state_ = IdentityAnimationState::kNotShowing;
// Update the text to the pre-shown state. This also makes sure that we now // Update the text to the pre-shown state. This also makes sure that we now
......
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