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

Side by Side Diff: ui/views/animation/ink_drop_animation_controller_impl_unittest.cc

Issue 1937103003: Rename of InkDropAnimation classes to InkDropRipple. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed test_ink_drop_animation_observer.h from views.gyp and doc update. Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/animation/ink_drop_animation_controller_impl.h" 5 #include "ui/views/animation/ink_drop_animation_controller_impl.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/test/test_simple_task_runner.h" 8 #include "base/test/test_simple_task_runner.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "ui/views/animation/ink_drop_animation.h" 11 #include "ui/views/animation/ink_drop_ripple.h"
12 #include "ui/views/animation/test/ink_drop_animation_controller_impl_test_api.h" 12 #include "ui/views/animation/test/ink_drop_animation_controller_impl_test_api.h"
13 #include "ui/views/animation/test/test_ink_drop_host.h" 13 #include "ui/views/animation/test/test_ink_drop_host.h"
14 14
15 namespace views { 15 namespace views {
16 16
17 // NOTE: The InkDropAnimationControllerImpl class is also tested by the 17 // NOTE: The InkDropAnimationControllerImpl class is also tested by the
18 // InkDropAnimationControllerFactoryTest tests. 18 // InkDropAnimationControllerFactoryTest tests.
19 class InkDropAnimationControllerImplTest : public testing::Test { 19 class InkDropAnimationControllerImplTest : public testing::Test {
20 public: 20 public:
21 InkDropAnimationControllerImplTest(); 21 InkDropAnimationControllerImplTest();
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 test_api_.CompleteAnimations(); 232 test_api_.CompleteAnimations();
233 233
234 ink_drop_animation_controller_.SetHovered(false); 234 ink_drop_animation_controller_.SetHovered(false);
235 EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers()); 235 EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
236 236
237 ink_drop_animation_controller_.SetHovered(true); 237 ink_drop_animation_controller_.SetHovered(true);
238 EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers()); 238 EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
239 } 239 }
240 240
241 } // namespace views 241 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/animation/ink_drop_animation_controller_impl.cc ('k') | ui/views/animation/ink_drop_animation_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698