Use ink drop hover for focus states on toolbar buttons and location

ui/views/animation/ink_drop_impl_unittest.cc

Index: ui/views/animation/ink_drop_impl_unittest.cc
diff --git a/ui/views/animation/ink_drop_impl_unittest.cc b/ui/views/animation/ink_drop_impl_unittest.cc
index ef480e051c74826e78e2530f1a1d299283d53f28..afaf0809ff2cc8ca695d4f7be2cb388f58ea43d9 100644
--- a/ui/views/animation/ink_drop_impl_unittest.cc
+++ b/ui/views/animation/ink_drop_impl_unittest.cc
@@ -62,6 +62,30 @@ TEST_F(InkDropImplTest, SetHoveredIsFadingInOrVisible) {
   EXPECT_FALSE(test_api_.IsHoverFadingInOrVisible());
 }
 
+TEST_F(InkDropImplTest, FocusAndHoverAtSameTime) {
+  ink_drop_host_.set_should_show_hover(true);
+  EXPECT_FALSE(test_api_.IsHoverFadingInOrVisible());
+
+  ink_drop_.SetFocused(true);
+  EXPECT_TRUE(test_api_.IsHoverFadingInOrVisible());
+
+  test_api_.CompleteAnimations();
+  ink_drop_.SetHovered(false);
+  EXPECT_TRUE(test_api_.IsHoverFadingInOrVisible());
+
+  test_api_.CompleteAnimations();
+  ink_drop_.SetHovered(true);
+  EXPECT_TRUE(test_api_.IsHoverFadingInOrVisible());
+
+  test_api_.CompleteAnimations();
+  ink_drop_.SetFocused(false);
+  EXPECT_TRUE(test_api_.IsHoverFadingInOrVisible());
+
+  test_api_.CompleteAnimations();
+  ink_drop_.SetHovered(false);
+  EXPECT_FALSE(test_api_.IsHoverFadingInOrVisible());
+}
+
 TEST_F(InkDropImplTest, HoverDoesntFadeInAfterAnimationIfHoverNotSet) {
   ink_drop_host_.set_should_show_hover(true);
   ink_drop_.SetHovered(false);