Chromium Code Reviews| Index: ui/views/animation/test/test_ink_drop_delegate.cc |
| diff --git a/ui/views/animation/test/test_ink_drop_delegate.cc b/ui/views/animation/test/test_ink_drop_delegate.cc |
| index 9d20cf0fffc09e5f7b6a6cacb83efcdc4e1b4330..332196beb3064cf40063ec1a9887a060fa435feb 100644 |
| --- a/ui/views/animation/test/test_ink_drop_delegate.cc |
| +++ b/ui/views/animation/test/test_ink_drop_delegate.cc |
| @@ -2,11 +2,31 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| +#include "ui/views/animation/ink_drop.h" |
| #include "ui/views/animation/test/test_ink_drop_delegate.h" |
| namespace views { |
| namespace test { |
| +class TestInkDrop : public InkDrop { |
| + public: |
| + TestInkDrop() : InkDrop() {} |
| + ~TestInkDrop() override {} |
| + |
| + InkDropState GetTargetInkDropState() const override { |
|
bruthig
2016/06/02 16:49:54
Please add NOTREACHED() for all methods except Set
|
| + return InkDropState::HIDDEN; |
| + } |
| + |
| + bool IsVisible() const override { return false; } |
| + void AnimateToState(InkDropState ink_drop_state) override {} |
| + void SnapToActivated() override {} |
| + void SetHovered(bool is_hovered) override {} |
| + void SetFocused(bool is_focused) override {} |
| + |
| + private: |
| + DISALLOW_COPY_AND_ASSIGN(TestInkDrop); |
| +}; |
| + |
| TestInkDropDelegate::TestInkDropDelegate() |
| : state_(InkDropState::HIDDEN), is_hovered_(false) {} |
| @@ -29,7 +49,9 @@ InkDropState TestInkDropDelegate::GetTargetInkDropState() const { |
| } |
| InkDrop* TestInkDropDelegate::GetInkDrop() { |
| - return nullptr; |
| + if (!ink_drop_.get()) |
| + ink_drop_.reset(new TestInkDrop); |
| + return ink_drop_.get(); |
| } |
| } // namespace test |