| 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 1884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1895 DVLOG(1) << "CancelWindowMove failed (no such window manager display root)"; | 1895 DVLOG(1) << "CancelWindowMove failed (no such window manager display root)"; |
| 1896 return; | 1896 return; |
| 1897 } | 1897 } |
| 1898 | 1898 |
| 1899 WindowManagerState* wms = display_root->window_manager_state(); | 1899 WindowManagerState* wms = display_root->window_manager_state(); |
| 1900 wms->window_tree()->window_manager_internal_->WmCancelMoveLoop( | 1900 wms->window_tree()->window_manager_internal_->WmCancelMoveLoop( |
| 1901 window_server_->GetCurrentMoveLoopChangeId()); | 1901 window_server_->GetCurrentMoveLoopChangeId()); |
| 1902 } | 1902 } |
| 1903 | 1903 |
| 1904 void WindowTree::AddAccelerators( | 1904 void WindowTree::AddAccelerators( |
| 1905 std::vector<mojom::AcceleratorPtr> accelerators, | 1905 std::vector<mojom::WmAcceleratorPtr> accelerators, |
| 1906 const AddAcceleratorsCallback& callback) { | 1906 const AddAcceleratorsCallback& callback) { |
| 1907 DCHECK(window_manager_state_); | 1907 DCHECK(window_manager_state_); |
| 1908 | 1908 |
| 1909 bool success = true; | 1909 bool success = true; |
| 1910 for (auto iter = accelerators.begin(); iter != accelerators.end(); ++iter) { | 1910 for (auto iter = accelerators.begin(); iter != accelerators.end(); ++iter) { |
| 1911 if (!window_manager_state_->event_dispatcher()->AddAccelerator( | 1911 if (!window_manager_state_->event_dispatcher()->AddAccelerator( |
| 1912 iter->get()->id, std::move(iter->get()->event_matcher))) | 1912 iter->get()->id, std::move(iter->get()->event_matcher))) |
| 1913 success = false; | 1913 success = false; |
| 1914 } | 1914 } |
| 1915 callback.Run(success); | 1915 callback.Run(success); |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2179 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset, | 2179 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset, |
| 2180 effect_bitmask, callback); | 2180 effect_bitmask, callback); |
| 2181 } | 2181 } |
| 2182 | 2182 |
| 2183 void WindowTree::PerformOnDragDropDone() { | 2183 void WindowTree::PerformOnDragDropDone() { |
| 2184 client()->OnDragDropDone(); | 2184 client()->OnDragDropDone(); |
| 2185 } | 2185 } |
| 2186 | 2186 |
| 2187 } // namespace ws | 2187 } // namespace ws |
| 2188 } // namespace ui | 2188 } // namespace ui |
| OLD | NEW |