ui/views/animation/ink_drop_animation_controller_impl_unittest.cc - Issue 1832963002: MD - add ripples to DL shelf items

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/animation/ink_drop_animation_controller_impl_unittest.cc

Issue 1832963002: MD - add ripples to DL shelf items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix another TODO Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/views/animation/ink_drop_animation_controller_impl_unittest.cc

diff --git a/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc b/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc

index 4f98549e0ffe18aa75f87c6903eecf84192a9d57..96e2d3ed199d76b815fd53305cab02fb240f2488 100644

--- a/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc

+++ b/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc

@@ -73,7 +73,7 @@ TEST_F(InkDropAnimationControllerImplTest,

HoverDoesntFadeInAfterAnimationIfHoverNotSet) {

ink_drop_host_.set_should_show_hover(true);

ink_drop_animation_controller_.SetHovered(false);

- ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);

+ ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_TRIGGERED);

EXPECT_FALSE(task_runner_->HasPendingTask());

EXPECT_FALSE(is_hover_fading_in_or_visible());

@@ -83,7 +83,7 @@ TEST_F(InkDropAnimationControllerImplTest,

HoverFadesInAfterAnimationWhenHostIsHovered) {

ink_drop_host_.set_should_show_hover(true);

ink_drop_animation_controller_.SetHovered(true);

- ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);

+ ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_TRIGGERED);

EXPECT_TRUE(task_runner_->HasPendingTask());

@@ -96,7 +96,7 @@ TEST_F(InkDropAnimationControllerImplTest,

HoverDoesntFadeInAfterAnimationWhenHostIsNotHovered) {

ink_drop_host_.set_should_show_hover(false);

ink_drop_animation_controller_.SetHovered(true);

- ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);

+ ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_TRIGGERED);

EXPECT_TRUE(task_runner_->HasPendingTask());

@@ -112,7 +112,7 @@ TEST_F(InkDropAnimationControllerImplTest,

ink_drop_animation_controller_.SetHovered(true);

EXPECT_TRUE(is_hover_fading_in_or_visible());

- ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);

+ ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_TRIGGERED);

EXPECT_FALSE(is_hover_fading_in_or_visible());

}