summaryrefslogtreecommitdiffstats
path: root/ash/drag_drop/drag_drop_controller.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 00:55:17 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 00:55:17 +0000
commit3f94b49b9a6422e91b4c1087d389bcff9fe9f0b5 (patch)
treec03c94e0bd83fffccc4806315faa081be8173b0b /ash/drag_drop/drag_drop_controller.h
parentbb54e63c4ecd10ea4379386cc2bdc540f76a6907 (diff)
downloadchromium_src-3f94b49b9a6422e91b4c1087d389bcff9fe9f0b5.zip
chromium_src-3f94b49b9a6422e91b4c1087d389bcff9fe9f0b5.tar.gz
chromium_src-3f94b49b9a6422e91b4c1087d389bcff9fe9f0b5.tar.bz2
Cancel drag upon screen lock.
I believe cancel upon capture lost is necessary regardless. BUG=175486 TEST=covered by tests, manually on lock screen. Review URL: https://codereview.chromium.org/13041002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_controller.h')
-rw-r--r--ash/drag_drop/drag_drop_controller.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
index 8c4e6bb..a23ed91 100644
--- a/ash/drag_drop/drag_drop_controller.h
+++ b/ash/drag_drop/drag_drop_controller.h
@@ -34,6 +34,7 @@ class DragDropControllerTest;
namespace internal {
class DragDropTracker;
+class DragDropTrackerDelegate;
class DragImageView;
class ASH_EXPORT DragDropController
@@ -127,6 +128,7 @@ class ASH_EXPORT DragDropController
base::Closure quit_closure_;
scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_;
+ scoped_ptr<DragDropTrackerDelegate> drag_drop_window_delegate_;
ui::DragDropTypes::DragEventSource current_drag_event_source_;