Cancel drag upon screen lock

ash/drag_drop/drag_drop_tracker.cc

Index: ash/drag_drop/drag_drop_tracker.cc
diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc
index 269e2edbc5f02d2f0c07f6ae3ca7fae988b23da0..9de464540a7da5b8fcf32f2f5854219523ebd590 100644
--- a/ash/drag_drop/drag_drop_tracker.cc
+++ b/ash/drag_drop/drag_drop_tracker.cc
@@ -11,25 +11,28 @@
 #include "ui/base/events/event.h"
 #include "ui/gfx/screen.h"
 
+namespace ash {
+namespace internal {
+
 namespace {
 
 // Creates a window for capturing drag events.
-aura::Window* CreateCaptureWindow(aura::RootWindow* context_root) {
-  aura::Window* window = new aura::Window(NULL);
+aura::Window* CreateCaptureWindow(aura::RootWindow* context_root,
+                                  aura::WindowDelegate* delegate) {
+  aura::Window* window = new aura::Window(delegate);
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_NOT_DRAWN);
   window->SetDefaultParentByRootWindow(context_root, gfx::Rect());
   window->Show();
+  DCHECK(window->bounds().size().IsEmpty());
   return window;
 }
 
 }  // namespace
 
-namespace ash {
-namespace internal {
-
-DragDropTracker::DragDropTracker(aura::RootWindow* context_root)
-    : capture_window_(CreateCaptureWindow(context_root)) {
+DragDropTracker::DragDropTracker(aura::RootWindow* context_root,
+                                 aura::WindowDelegate* delegate)
+    : capture_window_(CreateCaptureWindow(context_root, delegate)) {
 }
 
 DragDropTracker::~DragDropTracker()  {