| Index: ui/views/animation/test/ink_drop_host_view_test_api.cc
|
| diff --git a/ui/views/animation/test/ink_drop_host_view_test_api.cc b/ui/views/animation/test/ink_drop_host_view_test_api.cc
|
| index 42b5116fb88af37315d9b9cd07999efdd7c25b66..26b97995378af7dd0eba429711b9c55bc0cf8482 100644
|
| --- a/ui/views/animation/test/ink_drop_host_view_test_api.cc
|
| +++ b/ui/views/animation/test/ink_drop_host_view_test_api.cc
|
| @@ -13,14 +13,24 @@ InkDropHostViewTestApi::InkDropHostViewTestApi(InkDropHostView* host_view)
|
| InkDropHostViewTestApi::~InkDropHostViewTestApi() {}
|
|
|
| void InkDropHostViewTestApi::SetHasInkDrop(bool has_an_ink_drop) {
|
| - host_view_->SetHasInkDrop(has_an_ink_drop);
|
| + host_view_->SetHasInkDrop(
|
| + has_an_ink_drop ? InkDropHostView::INK_DROP_WITH_GESTURE_HANDLING
|
| + : InkDropHostView::NO_INK_DROP);
|
| }
|
|
|
| -void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop) {
|
| - host_view_->SetHasInkDrop(true);
|
| +void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop,
|
| + bool handles_gesture_events) {
|
| + host_view_->SetHasInkDrop(
|
| + handles_gesture_events
|
| + ? InkDropHostView::INK_DROP_WITH_GESTURE_HANDLING
|
| + : InkDropHostView::INK_DROP_WITHOUT_GESTURE_HANDLING);
|
| host_view_->ink_drop_ = std::move(ink_drop);
|
| }
|
|
|
| +void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop) {
|
| + SetInkDrop(std::move(ink_drop), true);
|
| +}
|
| +
|
| bool InkDropHostViewTestApi::HasGestureHandler() const {
|
| return host_view_->gesture_handler_ != nullptr;
|
| }
|
|
|