| 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 f0bb206988195053eec516343387ea688d8bf7c3..99bf71c9a55804720712a30d55a92ff5d183cbd1 100644
|
| --- a/ash/drag_drop/drag_drop_tracker.cc
|
| +++ b/ash/drag_drop/drag_drop_tracker.cc
|
| @@ -14,11 +14,11 @@
|
| namespace {
|
|
|
| // Creates a window for capturing drag events.
|
| -aura::Window* CreateCaptureWindow() {
|
| +aura::Window* CreateCaptureWindow(aura::RootWindow* context_root) {
|
| aura::Window* window = new aura::Window(NULL);
|
| window->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| window->Init(ui::LAYER_NOT_DRAWN);
|
| - window->SetParent(NULL);
|
| + window->SetDefaultParentByTargetRoot(context_root);
|
| window->Show();
|
| return window;
|
| }
|
| @@ -28,8 +28,8 @@ aura::Window* CreateCaptureWindow() {
|
| namespace ash {
|
| namespace internal {
|
|
|
| -DragDropTracker::DragDropTracker()
|
| - : capture_window_(CreateCaptureWindow()) {
|
| +DragDropTracker::DragDropTracker(aura::RootWindow* context_root)
|
| + : capture_window_(CreateCaptureWindow(context_root)) {
|
| capture_window_->SetCapture();
|
| }
|
|
|
|
|