| 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..687e10bdc9446943e54896724ffb0562eaea8559 100644
|
| --- a/ui/views/animation/test/test_ink_drop_delegate.cc
|
| +++ b/ui/views/animation/test/test_ink_drop_delegate.cc
|
| @@ -7,29 +7,28 @@
|
| namespace views {
|
| namespace test {
|
|
|
| -TestInkDropDelegate::TestInkDropDelegate()
|
| - : state_(InkDropState::HIDDEN), is_hovered_(false) {}
|
| +TestInkDropDelegate::TestInkDropDelegate() {}
|
|
|
| TestInkDropDelegate::~TestInkDropDelegate() {}
|
|
|
| void TestInkDropDelegate::OnAction(InkDropState state) {
|
| - state_ = state;
|
| + ink_drop_.AnimateToState(state);
|
| }
|
|
|
| void TestInkDropDelegate::SnapToActivated() {
|
| - state_ = InkDropState::ACTIVATED;
|
| + ink_drop_.SnapToActivated();
|
| }
|
|
|
| void TestInkDropDelegate::SetHovered(bool is_hovered) {
|
| - is_hovered_ = is_hovered;
|
| + ink_drop_.SetHovered(true);
|
| }
|
|
|
| InkDropState TestInkDropDelegate::GetTargetInkDropState() const {
|
| - return state_;
|
| + return ink_drop_.GetTargetInkDropState();
|
| }
|
|
|
| InkDrop* TestInkDropDelegate::GetInkDrop() {
|
| - return nullptr;
|
| + return &ink_drop_;
|
| }
|
|
|
| } // namespace test
|
|
|