diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 23:43:42 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 23:43:42 +0000 |
| commit | 1f2230bd510bca0e5382a60075aba525340d6a97 (patch) | |
| tree | 6bd20f5c23a76c4e08356a56a8d1ced7e7e4d57e /ash/drag_drop | |
| parent | c4dca5876da4e912fde959249de4a1d704884582 (diff) | |
| download | chromium_src-1f2230bd510bca0e5382a60075aba525340d6a97.zip chromium_src-1f2230bd510bca0e5382a60075aba525340d6a97.tar.gz chromium_src-1f2230bd510bca0e5382a60075aba525340d6a97.tar.bz2 | |
Plumb event flags (shift/alt/ctrl modifiers) for drag/drop events to WebKit.
WebKit side changes in https://bugs.webkit.org/show_bug.cgi?id=86236
BUG=125861
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10377119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 1bff88a..46d1a55 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -104,6 +104,7 @@ void DragDropController::DragUpdate(aura::Window* target, event.location(), event.root_location(), drag_operation_); + e.set_flags(event.flags()); delegate->OnDragEntered(e); } } else { @@ -112,6 +113,7 @@ void DragDropController::DragUpdate(aura::Window* target, event.location(), event.root_location(), drag_operation_); + e.set_flags(event.flags()); int op = delegate->OnDragUpdated(e); gfx::NativeCursor cursor = (op == ui::DragDropTypes::DRAG_NONE)? ui::kCursorNoDrop : ui::kCursorCopy; @@ -141,6 +143,7 @@ void DragDropController::Drop(aura::Window* target, if ((delegate = aura::client::GetDragDropDelegate(target))) { aura::DropTargetEvent e( *drag_data_, event.location(), event.root_location(), drag_operation_); + e.set_flags(event.flags()); drag_operation_ = delegate->OnPerformDrop(e); if (drag_operation_ == 0) StartCanceledAnimation(); |