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

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

Issue 1944043002: Enabled tests to control material design ink drop animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Replaced unique_ptr with scoped_ptr. 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 c223a699915d607857bcd6a496c38a272109aad2..5769c3bdcf0f6400f3384c99de1b9db0f217a228 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl.h
+++ b/ui/views/animation/ink_drop_animation_controller_impl.h
@@ -18,6 +18,10 @@ class Timer;
} // namespace base
namespace views {
+namespace test {
+class InkDropAnimationControllerImplTestApi;
+} // namespace test
+
class InkDropAnimation;
class InkDropHost;
class InkDropHover;
@@ -41,8 +45,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