Prevent double focus effect in IconLabelBubbleView

IconLabelBubbleView::AnimationEnded used to call
GetInkDrop()->SetShowHighlightOnFocus(true) to restore the original
InkDrop highlight state before this change. This is incorrect as the
initial highlight focus depends on the presence of a focus ring.

This changes the call to restore highlight-on-focus based on the
presence of a focus ring instead of unconditionally highlighting.

Bug: chromium:1025152
Change-Id: I5e6d563bc012a16a5bf4a63404375c4d4d1418e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949034
Auto-Submit: Peter Boström <pbos@chromium.org>
Commit-Queue: Caroline Rising <corising@chromium.org>
Reviewed-by: Caroline Rising <corising@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721156}

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

@@ -363,7 +363,7 @@ void IconLabelBubbleView::AnimationEnded(const gfx::Animation* animation) {
   }
 
   GetInkDrop()->SetShowHighlightOnHover(true);
-  GetInkDrop()->SetShowHighlightOnFocus(true);
+  GetInkDrop()->SetShowHighlightOnFocus(!focus_ring());
 }
 
 void IconLabelBubbleView::AnimationProgressed(const gfx::Animation* animation) {