| 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 b4beb7859c0aee10dd2051b6657b1ceb6ac315c5..2e5164225baaaa4877f2f7c218dba1ad6b0aeeb4 100644
|
| --- a/ui/views/animation/test/test_ink_drop_host.h
|
| +++ b/ui/views/animation/test/test_ink_drop_host.h
|
| @@ -12,6 +12,8 @@ namespace views {
|
|
|
| // A non-functional implementation of an InkDropHost that can be used during
|
| // tests. Tracks the number of hosted ink drop layers.
|
| +//
|
| +// Note that CreateInkDrop() is not supported.
|
| class TestInkDropHost : public InkDropHost {
|
| public:
|
| TestInkDropHost();
|
| @@ -22,21 +24,15 @@ class TestInkDropHost : public InkDropHost {
|
| return num_ink_drop_layers_added_ - num_ink_drop_layers_removed_;
|
| }
|
|
|
| - void set_should_show_highlight(bool should_show_highlight) {
|
| - should_show_highlight_ = should_show_highlight;
|
| - }
|
| -
|
| void set_disable_timers_for_test(bool disable_timers_for_test) {
|
| disable_timers_for_test_ = disable_timers_for_test;
|
| }
|
|
|
| - void set_ripple_overrides_highlight(bool overrides_highlight) {
|
| - ripple_overrides_highlight_ = overrides_highlight;
|
| - }
|
| -
|
| // TestInkDropHost:
|
| void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
|
| void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
|
| + // Not supported.
|
| + std::unique_ptr<InkDrop> CreateInkDrop() override;
|
| std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override;
|
| std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override;
|
|
|
| @@ -44,10 +40,6 @@ class TestInkDropHost : public InkDropHost {
|
| int num_ink_drop_layers_added_;
|
| int num_ink_drop_layers_removed_;
|
|
|
| - bool should_show_highlight_;
|
| -
|
| - bool ripple_overrides_highlight_;
|
| -
|
| // When true, the InkDropRipple/InkDropHighlight instances will have their
|
| // timers disabled after creation.
|
| bool disable_timers_for_test_;
|
|
|