| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/ui/ws/window_tree.h" | 5 #include "services/ui/ws/window_tree.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1698 if (!display_root) { | 1698 if (!display_root) { |
| 1699 DVLOG(1) << "CancelWindowMove failed (no such window manager display root)"; | 1699 DVLOG(1) << "CancelWindowMove failed (no such window manager display root)"; |
| 1700 return; | 1700 return; |
| 1701 } | 1701 } |
| 1702 | 1702 |
| 1703 WindowManagerState* wms = display_root->window_manager_state(); | 1703 WindowManagerState* wms = display_root->window_manager_state(); |
| 1704 wms->window_tree()->window_manager_internal_->WmCancelMoveLoop( | 1704 wms->window_tree()->window_manager_internal_->WmCancelMoveLoop( |
| 1705 window_server_->GetCurrentMoveLoopChangeId()); | 1705 window_server_->GetCurrentMoveLoopChangeId()); |
| 1706 } | 1706 } |
| 1707 | 1707 |
| 1708 void WindowTree::AddAccelerator(uint32_t id, | 1708 void WindowTree::AddAccelerators( |
| 1709 mojom::EventMatcherPtr event_matcher, | 1709 std::vector<mojom::AcceleratorPtr> accelerators, |
| 1710 const AddAcceleratorCallback& callback) { | 1710 const AddAcceleratorsCallback& callback) { |
| 1711 DCHECK(window_manager_state_); | 1711 DCHECK(window_manager_state_); |
| 1712 const bool success = | 1712 const bool success = |
| 1713 window_manager_state_->event_dispatcher()->AddAccelerator( | 1713 window_manager_state_->event_dispatcher()->AddAccelerators( |
| 1714 id, std::move(event_matcher)); | 1714 std::move(accelerators)); |
| 1715 callback.Run(success); | 1715 callback.Run(success); |
| 1716 } | 1716 } |
| 1717 | 1717 |
| 1718 void WindowTree::RemoveAccelerator(uint32_t id) { | 1718 void WindowTree::RemoveAccelerator(uint32_t id) { |
| 1719 window_manager_state_->event_dispatcher()->RemoveAccelerator(id); | 1719 window_manager_state_->event_dispatcher()->RemoveAccelerator(id); |
| 1720 } | 1720 } |
| 1721 | 1721 |
| 1722 void WindowTree::AddActivationParent(Id transport_window_id) { | 1722 void WindowTree::AddActivationParent(Id transport_window_id) { |
| 1723 AddActivationParent(ClientWindowId(transport_window_id)); | 1723 AddActivationParent(ClientWindowId(transport_window_id)); |
| 1724 } | 1724 } |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1965 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset, | 1965 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset, |
| 1966 effect_bitmask, callback); | 1966 effect_bitmask, callback); |
| 1967 } | 1967 } |
| 1968 | 1968 |
| 1969 void WindowTree::PerformOnDragDropDone() { | 1969 void WindowTree::PerformOnDragDropDone() { |
| 1970 client()->OnDragDropDone(); | 1970 client()->OnDragDropDone(); |
| 1971 } | 1971 } |
| 1972 | 1972 |
| 1973 } // namespace ws | 1973 } // namespace ws |
| 1974 } // namespace ui | 1974 } // namespace ui |
| OLD | NEW |