| 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 "ash/drag_drop/drag_drop_tracker.h" | 7 #include "ash/drag_drop/drag_drop_tracker.h" |
| 8 #include "ash/drag_drop/drag_image_view.h" | 8 #include "ash/drag_drop/drag_image_view.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/wm/coordinate_conversion.h" | 10 #include "ash/wm/coordinate_conversion.h" |
| 11 #include "ash/wm/cursor_manager.h" | |
| 12 #include "base/bind.h" | 11 #include "base/bind.h" |
| 13 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
| 14 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 15 #include "ui/aura/client/capture_client.h" | 14 #include "ui/aura/client/capture_client.h" |
| 16 #include "ui/aura/client/drag_drop_delegate.h" | 15 #include "ui/aura/client/drag_drop_delegate.h" |
| 17 #include "ui/aura/env.h" | 16 #include "ui/aura/env.h" |
| 18 #include "ui/aura/root_window.h" | 17 #include "ui/aura/root_window.h" |
| 19 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
| 20 #include "ui/base/animation/linear_animation.h" | 19 #include "ui/base/animation/linear_animation.h" |
| 21 #include "ui/base/dragdrop/drag_drop_types.h" | 20 #include "ui/base/dragdrop/drag_drop_types.h" |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 495 drag_window_->RemoveObserver(this); | 494 drag_window_->RemoveObserver(this); |
| 496 drag_window_ = NULL; | 495 drag_window_ = NULL; |
| 497 drag_data_ = NULL; | 496 drag_data_ = NULL; |
| 498 // Cleanup can be called again while deleting DragDropTracker, so use Pass | 497 // Cleanup can be called again while deleting DragDropTracker, so use Pass |
| 499 // instead of reset to avoid double free. | 498 // instead of reset to avoid double free. |
| 500 drag_drop_tracker_.Pass(); | 499 drag_drop_tracker_.Pass(); |
| 501 } | 500 } |
| 502 | 501 |
| 503 } // namespace internal | 502 } // namespace internal |
| 504 } // namespace ash | 503 } // namespace ash |
| OLD | NEW |