| Index: ui/views/view.cc
|
| diff --git a/ui/views/view.cc b/ui/views/view.cc
|
| index 0fc755972d6d57de055a7ea9d31fa11733eaf13b..2b7a2a40f6e4b9f23668626f09a887c1d2718394 100644
|
| --- a/ui/views/view.cc
|
| +++ b/ui/views/view.cc
|
| @@ -39,6 +39,7 @@
|
| #include "ui/gfx/transform.h"
|
| #include "ui/native_theme/native_theme.h"
|
| #include "ui/views/accessibility/native_view_accessibility.h"
|
| +#include "ui/views/animation/ink_drop_delegate.h"
|
| #include "ui/views/background.h"
|
| #include "ui/views/border.h"
|
| #include "ui/views/context_menu_controller.h"
|
| @@ -518,6 +519,10 @@ void View::Layout() {
|
| child->Layout();
|
| }
|
| }
|
| +
|
| + InkDropDelegate* ink_drop_delegate = GetInkDropDelegate();
|
| + if (ink_drop_delegate)
|
| + ink_drop_delegate->Layout();
|
| }
|
|
|
| void View::InvalidateLayout() {
|
| @@ -1015,6 +1020,9 @@ void View::OnTouchEvent(ui::TouchEvent* event) {
|
| }
|
|
|
| void View::OnGestureEvent(ui::GestureEvent* event) {
|
| + InkDropDelegate* ink_drop_delegate = GetInkDropDelegate();
|
| + if (ink_drop_delegate)
|
| + ink_drop_delegate->OnGestureEvent(*event);
|
| }
|
|
|
| const ui::InputMethod* View::GetInputMethod() const {
|
| @@ -1254,6 +1262,9 @@ int View::OnPerformDrop(const ui::DropTargetEvent& event) {
|
| }
|
|
|
| void View::OnDragDone() {
|
| + InkDropDelegate* ink_drop_delegate = GetInkDropDelegate();
|
| + if (ink_drop_delegate)
|
| + ink_drop_delegate->OnActionComplete();
|
| }
|
|
|
| // static
|
| @@ -1519,6 +1530,12 @@ void View::ReorderChildLayers(ui::Layer* parent_layer) {
|
| }
|
| }
|
|
|
| +// Animations ----------------------------------------------------------------
|
| +
|
| +InkDropDelegate* View::GetInkDropDelegate() const {
|
| + return nullptr;
|
| +}
|
| +
|
| // Input -----------------------------------------------------------------------
|
|
|
| View::DragInfo* View::GetDragInfo() {
|
|
|