ui/aura_shell/drag_drop_controller.h - Issue 8682029: Make drag and drop work on webpage. Also slightly modify drag drop workflow.

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/aura_shell/drag_drop_controller.h

Issue 8682029: Make drag and drop work on webpage. Also slightly modify drag drop workflow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: modified according to comments Created 9 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/aura_shell/drag_drop_controller.h

diff --git a/ui/aura_shell/drag_drop_controller.h b/ui/aura_shell/drag_drop_controller.h

index 6d70acfebd307c9395258db11af029f4d36ffb6e..5d87ad6f972680e691fc552ec5a2341fa92bc3da 100644

--- a/ui/aura_shell/drag_drop_controller.h

+++ b/ui/aura_shell/drag_drop_controller.h

@@ -39,13 +39,14 @@ class AURA_SHELL_EXPORT DragDropController : public aura::DragDropClient,

}

// Overridden from aura::DragDropClient:

- virtual void StartDragAndDrop(const ui::OSExchangeData& data,

+ virtual int StartDragAndDrop(const ui::OSExchangeData& data,

int operation) OVERRIDE;

virtual void DragUpdate(aura::Window* target,

const aura::MouseEvent& event) OVERRIDE;

virtual void Drop(aura::Window* target,

const aura::MouseEvent& event) OVERRIDE;

virtual void DragCancel() OVERRIDE;

+ virtual bool IsDragDropInProgress() OVERRIDE;

// Overridden from aura::EventFilter:

virtual bool PreHandleKeyEvent(aura::Window* target,

« no previous file with comments | « ui/aura/client/window_drag_drop_delegate.h ('k') | ui/aura_shell/drag_drop_controller.cc » ('j') | no next file with comments »