| Index: ash/drag_drop/drag_drop_controller.h
|
| diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
|
| index 4c326966d97f00a96f2e0beea000a0b9fc6485e9..96210f0bc08fa73a0292aed180ea4e34d523046e 100644
|
| --- a/ash/drag_drop/drag_drop_controller.h
|
| +++ b/ash/drag_drop/drag_drop_controller.h
|
| @@ -49,10 +49,12 @@ class ASH_EXPORT DragDropController
|
| }
|
|
|
| // Overridden from aura::client::DragDropClient:
|
| - virtual int StartDragAndDrop(const ui::OSExchangeData& data,
|
| - aura::RootWindow* root_window,
|
| - const gfx::Point& root_location,
|
| - int operation) OVERRIDE;
|
| + virtual int StartDragAndDrop(
|
| + const ui::OSExchangeData& data,
|
| + aura::RootWindow* root_window,
|
| + const gfx::Point& root_location,
|
| + int operation,
|
| + ui::DragDropTypes::DragEventSource source) OVERRIDE;
|
| virtual void DragUpdate(aura::Window* target,
|
| const ui::LocatedEvent& event) OVERRIDE;
|
| virtual void Drop(aura::Window* target,
|
|
|