| Index: ui/views/animation/ink_drop_host_view.cc
|
| diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
|
| index 879dbc72d0a75e00b2863cc20102ea2d54245838..98b5e1ff8241a3c59cfa3aeb0c08a52896c10467 100644
|
| --- a/ui/views/animation/ink_drop_host_view.cc
|
| +++ b/ui/views/animation/ink_drop_host_view.cc
|
| @@ -242,16 +242,19 @@ bool InkDropHostView::ShouldShowInkDropForFocus() const {
|
| return false;
|
| }
|
|
|
| -void InkDropHostView::SetHasInkDrop(bool has_an_ink_drop) {
|
| - if (has_an_ink_drop) {
|
| +void InkDropHostView::SetHasInkDrop(InkDropType ink_drop_type) {
|
| + if (ink_drop_type == NO_INK_DROP)
|
| + ink_drop_.reset(new InkDropStub());
|
| + else
|
| ink_drop_.reset(new InkDropImpl(this));
|
| - if (!gesture_handler_)
|
| - gesture_handler_.reset(new InkDropGestureHandler(this, ink_drop_.get()));
|
| - else
|
| +
|
| + if (ink_drop_type == INK_DROP_WITH_GESTURE_HANDLING) {
|
| + if (gesture_handler_)
|
| gesture_handler_->SetInkDrop(ink_drop_.get());
|
| + else
|
| + gesture_handler_.reset(new InkDropGestureHandler(this, ink_drop_.get()));
|
| } else {
|
| gesture_handler_.reset();
|
| - ink_drop_.reset(new InkDropStub());
|
| }
|
| }
|
|
|
|
|