| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ui/aura/mus/drag_drop_controller_mus.h" | 5 #include "ui/aura/mus/drag_drop_controller_mus.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 // The change id of the drag. Used to identify the drag on the server. | 43 // The change id of the drag. Used to identify the drag on the server. |
| 44 uint32_t change_id; | 44 uint32_t change_id; |
| 45 | 45 |
| 46 // The result of the drag. This is set on completion and returned to the | 46 // The result of the drag. This is set on completion and returned to the |
| 47 // caller. | 47 // caller. |
| 48 uint32_t completed_action; | 48 uint32_t completed_action; |
| 49 | 49 |
| 50 // OSExchangeData supplied to StartDragAndDrop(). | 50 // OSExchangeData supplied to StartDragAndDrop(). |
| 51 const ui::OSExchangeData& drag_data; | 51 const ui::OSExchangeData& drag_data; |
| 52 | 52 |
| 53 // StartDragDrop() runs a nested message loop. This closure is used to quit | 53 // StartDragDrop() runs a nested run loop. This closure is used to quit |
| 54 // the run loop when the drag completes. | 54 // the run loop when the drag completes. |
| 55 base::Closure runloop_quit_closure; | 55 base::Closure runloop_quit_closure; |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 DragDropControllerMus::DragDropControllerMus( | 58 DragDropControllerMus::DragDropControllerMus( |
| 59 DragDropControllerHost* drag_drop_controller_host, | 59 DragDropControllerHost* drag_drop_controller_host, |
| 60 ui::mojom::WindowTree* window_tree) | 60 ui::mojom::WindowTree* window_tree) |
| 61 : drag_drop_controller_host_(drag_drop_controller_host), | 61 : drag_drop_controller_host_(drag_drop_controller_host), |
| 62 window_tree_(window_tree) {} | 62 window_tree_(window_tree) {} |
| 63 | 63 |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 std::unique_ptr<ui::DropTargetEvent> event = | 213 std::unique_ptr<ui::DropTargetEvent> event = |
| 214 base::MakeUnique<ui::DropTargetEvent>( | 214 base::MakeUnique<ui::DropTargetEvent>( |
| 215 current_drag_state_ ? current_drag_state_->drag_data | 215 current_drag_state_ ? current_drag_state_->drag_data |
| 216 : *(os_exchange_data_.get()), | 216 : *(os_exchange_data_.get()), |
| 217 location, root_location, effect_bitmask); | 217 location, root_location, effect_bitmask); |
| 218 event->set_flags(event_flags); | 218 event->set_flags(event_flags); |
| 219 return event; | 219 return event; |
| 220 } | 220 } |
| 221 | 221 |
| 222 } // namespace aura | 222 } // namespace aura |
| OLD | NEW |