| Index: ui/views/animation/test/test_ink_drop_delegate.h
|
| diff --git a/ui/views/animation/test/test_ink_drop_delegate.h b/ui/views/animation/test/test_ink_drop_delegate.h
|
| index 12e1e4947149306b64c19ce003242d9dbe5e382c..ce8415605b48a0904844f07733fad681b0ca5c37 100644
|
| --- a/ui/views/animation/test/test_ink_drop_delegate.h
|
| +++ b/ui/views/animation/test/test_ink_drop_delegate.h
|
| @@ -6,8 +6,8 @@
|
| #define UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_DELEGATE_H_
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/ptr_util.h"
|
| #include "ui/views/animation/ink_drop_delegate.h"
|
| +#include "ui/views/animation/test/test_ink_drop.h"
|
|
|
| namespace views {
|
| namespace test {
|
| @@ -17,7 +17,7 @@ class TestInkDropDelegate : public InkDropDelegate {
|
| TestInkDropDelegate();
|
| ~TestInkDropDelegate() override;
|
|
|
| - bool is_hovered() const { return is_hovered_; }
|
| + bool is_hovered() const { return ink_drop_.is_hovered(); }
|
|
|
| // InkDropDelegate:
|
| void OnAction(InkDropState state) override;
|
| @@ -27,11 +27,7 @@ class TestInkDropDelegate : public InkDropDelegate {
|
| InkDrop* GetInkDrop() override;
|
|
|
| private:
|
| - InkDropState state_;
|
| -
|
| - bool is_hovered_;
|
| -
|
| - std::unique_ptr<InkDrop> ink_drop_;
|
| + TestInkDrop ink_drop_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestInkDropDelegate);
|
| };
|
|
|