Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3407)

Unified Diff: ash/drag_drop/drag_drop_controller.cc

Issue 10377119: Plumb event flags (shift/alt/ctrl modifiers) for drag/drop events to WebKit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed compile error Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_controller.cc
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
index 1bff88aea564133dad3ef09aafd4bb643b8b4f37..46d1a5529e7a4f6d4bed982d1b896d28364b2b5a 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();
« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698