ui/views/controls/menu/menu_controller.cc - Issue 11368072: aura: Add flag to indicate if a drag session is started with touch or mouse.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/menu/menu_controller.cc

Issue 11368072: aura: Add flag to indicate if a drag session is started with touch or mouse. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: patch Created 8 years, 1 month 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

Index: ui/views/controls/menu/menu_controller.cc

diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc

index 2bba4026b2f39ce87af51d03d097bde9d2bd1d6a..3875b5fd87c4a1a8d39daa722fd541cac84585ab 100644

--- a/ui/views/controls/menu/menu_controller.cc

+++ b/ui/views/controls/menu/menu_controller.cc

@@ -863,7 +863,9 @@ void MenuController::StartDrag(SubmenuView* source,

StopScrolling();

int drag_ops = item->GetDelegate()->GetDragOperations(item);

drag_in_progress_ = true;

- item->GetWidget()->RunShellDrag(NULL, data, widget_loc, drag_ops);

+ // TODO(varunjain): Properly determine and send DRAG_EVENT_SOURCE below.

+ item->GetWidget()->RunShellDrag(NULL, data, widget_loc, drag_ops,

+ ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);

drag_in_progress_ = false;

if (GetActiveInstance() == this) {

« no previous file with comments | « ui/base/dragdrop/drag_drop_types.h ('k') | ui/views/drag_utils.h » ('j') | no next file with comments »