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

ui/views/animation/ink_drop_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/animation/ink_drop_impl.h"
 
 #include "base/macros.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 44 matching lines @@
 
   ink_drop_.SetHovered(true);
   EXPECT_TRUE(test_api_.IsHoverFadingInOrVisible());
 
   test_api_.CompleteAnimations();
 
   ink_drop_.SetHovered(false);
   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);
   ink_drop_.AnimateToState(InkDropState::ACTION_TRIGGERED);
   test_api_.CompleteAnimations();
 
   EXPECT_FALSE(task_runner_->HasPendingTask());
   EXPECT_FALSE(test_api_.IsHoverFadingInOrVisible());
 }
 
@@ skipping 147 matching lines @@
   test_api_.CompleteAnimations();
 
   ink_drop_.SetHovered(false);
   EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
 
   ink_drop_.SetHovered(true);
   EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
 }
 
 }  // namespace views