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

Unified Diff: ui/views/animation/ink_drop_animation_controller_impl.h

Issue 1913243002: Enabled tests to control material design ink drop animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with master. 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_controller_impl.h
diff --git a/ui/views/animation/ink_drop_animation_controller_impl.h b/ui/views/animation/ink_drop_animation_controller_impl.h
index 41bd3f264e97255b4e36dc1c0c487f9d4d723092..e0759750e9fdbf5f727c885366714967298fd32a 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl.h
+++ b/ui/views/animation/ink_drop_animation_controller_impl.h
@@ -19,6 +19,10 @@ class Timer;
} // namespace base
namespace views {
+namespace test {
+class InkDropAnimationControllerImplTestApi;
+} // namespace test
+
class InkDropAnimation;
class InkDropHost;
class InkDropHover;
@@ -42,8 +46,7 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl
void SetHovered(bool is_hovered) override;
private:
- friend class InkDropAnimationControllerFactoryTest;
- friend class InkDropAnimationControllerImplTest;
+ friend class test::InkDropAnimationControllerImplTestApi;
// Destroys |ink_drop_animation_| if it's targeted to the HIDDEN state.
void DestroyHiddenTargetedAnimations();
« no previous file with comments | « ui/views/animation/ink_drop_animation.cc ('k') | ui/views/animation/ink_drop_animation_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698