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

Unified Diff: ash/drag_drop/drag_drop_controller.h

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 | « no previous file | ash/drag_drop/drag_drop_controller.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.h
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
index 4c326966d97f00a96f2e0beea000a0b9fc6485e9..dddfc45b9fddc7743bbfb1f0d08928c1ad45fdfe 100644
--- a/ash/drag_drop/drag_drop_controller.h
+++ b/ash/drag_drop/drag_drop_controller.h
@@ -49,10 +49,13 @@ class ASH_EXPORT DragDropController
}
// Overridden from aura::client::DragDropClient:
- virtual int StartDragAndDrop(const ui::OSExchangeData& data,
- aura::RootWindow* root_window,
- const gfx::Point& root_location,
- int operation) OVERRIDE;
+ virtual int StartDragAndDrop(
+ const ui::OSExchangeData& data,
+ aura::RootWindow* root_window,
+ aura::Window* source_window,
+ const gfx::Point& root_location,
+ int operation,
+ ui::DragDropTypes::DragEventSource source) OVERRIDE;
virtual void DragUpdate(aura::Window* target,
const ui::LocatedEvent& event) OVERRIDE;
virtual void Drop(aura::Window* target,
« no previous file with comments | « no previous file | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698