ash/drag_drop/drag_drop_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: ash/drag_drop/drag_drop_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

« no previous file with comments | « ash/drag_drop/drag_drop_controller.h ('k') | ash/drag_drop/drag_drop_controller_unittest.cc » ('j') | content/browser/web_contents/web_contents_view_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 01788dd08822d220da04054f551d6a4c5576ddf5..1ec9c1bedfbe7682d3a6b09e3d14ee9559cf199d 100644

--- a/ash/drag_drop/drag_drop_controller.cc

+++ b/ash/drag_drop/drag_drop_controller.cc

@@ -56,10 +56,12 @@ DragDropController::~DragDropController() {

drag_image_.reset();

}

-int DragDropController::StartDragAndDrop(const ui::OSExchangeData& data,

- aura::RootWindow* root_window,

- const gfx::Point& root_location,

- int operation) {

+int DragDropController::StartDragAndDrop(

+ const ui::OSExchangeData& data,

+ aura::RootWindow* root_window,

+ const gfx::Point& root_location,

+ int operation,

+ ui::DragDropTypes::DragEventSource source) {

DCHECK(!IsDragDropInProgress());

drag_drop_tracker_.reset(new DragDropTracker);