Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Unified Diff: ui/views/animation/ink_drop_animation_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:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/animation/ink_drop_animation_unittest.cc
diff --git a/ui/views/animation/ink_drop_animation_unittest.cc b/ui/views/animation/ink_drop_animation_unittest.cc
index 22f62300b53b6564e7177123e48fada1d8b90ab5..5db3e8929807fffe1f7ddcfc4b3bd1b538ebf09e 100644
--- a/ui/views/animation/ink_drop_animation_unittest.cc
+++ b/ui/views/animation/ink_drop_animation_unittest.cc
@@ -130,7 +130,7 @@ TEST_P(InkDropAnimationTest, ActionPendingOpacity) {
TEST_P(InkDropAnimationTest, QuickActionOpacity) {
ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
- ink_drop_animation_->AnimateToState(views::InkDropState::QUICK_ACTION);
+ ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_TRIGGERED);
test_api_->CompleteAnimations();
EXPECT_EQ(InkDropAnimation::kHiddenOpacity, test_api_->GetCurrentOpacity());
@@ -138,7 +138,8 @@ TEST_P(InkDropAnimationTest, QuickActionOpacity) {
TEST_P(InkDropAnimationTest, SlowActionPendingOpacity) {
ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
- ink_drop_animation_->AnimateToState(views::InkDropState::SLOW_ACTION_PENDING);
+ ink_drop_animation_->AnimateToState(
+ views::InkDropState::ALTERNATE_ACTION_PENDING);
test_api_->CompleteAnimations();
EXPECT_EQ(InkDropAnimation::kVisibleOpacity, test_api_->GetCurrentOpacity());
@@ -146,8 +147,10 @@ TEST_P(InkDropAnimationTest, SlowActionPendingOpacity) {
TEST_P(InkDropAnimationTest, SlowActionOpacity) {
ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
- ink_drop_animation_->AnimateToState(views::InkDropState::SLOW_ACTION_PENDING);
- ink_drop_animation_->AnimateToState(views::InkDropState::SLOW_ACTION);
+ ink_drop_animation_->AnimateToState(
+ views::InkDropState::ALTERNATE_ACTION_PENDING);
+ ink_drop_animation_->AnimateToState(
+ views::InkDropState::ALTERNATE_ACTION_TRIGGERED);
test_api_->CompleteAnimations();
EXPECT_EQ(InkDropAnimation::kHiddenOpacity, test_api_->GetCurrentOpacity());
@@ -210,7 +213,7 @@ TEST_P(InkDropAnimationTest, VerifyObserversAreNotifiedOfSuccessfulAnimations) {
TEST_P(InkDropAnimationTest, VerifyObserversAreNotifiedOfPreemptedAnimations) {
ink_drop_animation_->AnimateToState(InkDropState::ACTION_PENDING);
- ink_drop_animation_->AnimateToState(InkDropState::SLOW_ACTION_PENDING);
+ ink_drop_animation_->AnimateToState(InkDropState::ALTERNATE_ACTION_PENDING);
EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
EXPECT_EQ(InkDropAnimationObserver::InkDropAnimationEndedReason::PRE_EMPTED,
« no previous file with comments | « ui/views/animation/ink_drop_animation_controller_impl_unittest.cc ('k') | ui/views/animation/ink_drop_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698