OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/drag_drop/drag_drop_controller.h" | 5 #include "ash/drag_drop/drag_drop_controller.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/drag_drop/drag_image_view.h" | |
10 #include "ash/common/wm_shell.h" | |
11 #include "ash/common/wm_window.h" | |
12 #include "ash/drag_drop/drag_drop_tracker.h" | 9 #include "ash/drag_drop/drag_drop_tracker.h" |
| 10 #include "ash/drag_drop/drag_image_view.h" |
13 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ash/wm_shell.h" |
| 13 #include "ash/wm_window.h" |
14 #include "base/bind.h" | 14 #include "base/bind.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/metrics/histogram_macros.h" | 16 #include "base/metrics/histogram_macros.h" |
17 #include "base/run_loop.h" | 17 #include "base/run_loop.h" |
18 #include "base/threading/thread_task_runner_handle.h" | 18 #include "base/threading/thread_task_runner_handle.h" |
19 #include "ui/aura/client/capture_client.h" | 19 #include "ui/aura/client/capture_client.h" |
20 #include "ui/aura/client/drag_drop_delegate.h" | 20 #include "ui/aura/client/drag_drop_delegate.h" |
21 #include "ui/aura/env.h" | 21 #include "ui/aura/env.h" |
22 #include "ui/aura/window.h" | 22 #include "ui/aura/window.h" |
23 #include "ui/aura/window_delegate.h" | 23 #include "ui/aura/window_delegate.h" |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
574 if (drag_window_) | 574 if (drag_window_) |
575 drag_window_->RemoveObserver(this); | 575 drag_window_->RemoveObserver(this); |
576 drag_window_ = NULL; | 576 drag_window_ = NULL; |
577 drag_data_ = NULL; | 577 drag_data_ = NULL; |
578 // Cleanup can be called again while deleting DragDropTracker, so delete | 578 // Cleanup can be called again while deleting DragDropTracker, so delete |
579 // the pointer with a local variable to avoid double free. | 579 // the pointer with a local variable to avoid double free. |
580 std::unique_ptr<ash::DragDropTracker> holder = std::move(drag_drop_tracker_); | 580 std::unique_ptr<ash::DragDropTracker> holder = std::move(drag_drop_tracker_); |
581 } | 581 } |
582 | 582 |
583 } // namespace ash | 583 } // namespace ash |
OLD | NEW |