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

Unified Diff: ui/views/animation/test/test_ink_drop_host.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
« no previous file with comments | « ui/views/animation/test/ink_drop_hover_test_api.cc ('k') | ui/views/animation/test/test_ink_drop_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/test/test_ink_drop_host.h
diff --git a/ui/views/animation/test/test_ink_drop_host.h b/ui/views/animation/test/test_ink_drop_host.h
index 139ffec2d68c7060d65eb16e76ed8257782ac683..f96fe2fe8308995fcfc762e85b9a5608dddaa421 100644
--- a/ui/views/animation/test/test_ink_drop_host.h
+++ b/ui/views/animation/test/test_ink_drop_host.h
@@ -23,6 +23,10 @@ class TestInkDropHost : public InkDropHost {
should_show_hover_ = should_show_hover;
}
+ void set_disable_timers_for_test(bool disable_timers_for_test) {
+ disable_timers_for_test_ = disable_timers_for_test;
+ }
+
// TestInkDropHost:
void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
@@ -34,6 +38,10 @@ class TestInkDropHost : public InkDropHost {
bool should_show_hover_;
+ // When true, the InkDropAnimation/InkDropHover instances will have their
+ // timers disabled after creation.
+ bool disable_timers_for_test_;
+
DISALLOW_COPY_AND_ASSIGN(TestInkDropHost);
};
« no previous file with comments | « ui/views/animation/test/ink_drop_hover_test_api.cc ('k') | ui/views/animation/test/test_ink_drop_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698