| 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 "ui/aura/mus/window_tree_client.h" | 5 #include "ui/aura/mus/window_tree_client.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1446 ui::mojom::Cursor cursor_id) { | 1446 ui::mojom::Cursor cursor_id) { |
| 1447 window_manager_internal_client_->WmSetNonClientCursor( | 1447 window_manager_internal_client_->WmSetNonClientCursor( |
| 1448 WindowMus::Get(window)->server_id(), cursor_id); | 1448 WindowMus::Get(window)->server_id(), cursor_id); |
| 1449 } | 1449 } |
| 1450 | 1450 |
| 1451 void WindowTreeClient::AddAccelerator( | 1451 void WindowTreeClient::AddAccelerator( |
| 1452 uint32_t id, | 1452 uint32_t id, |
| 1453 ui::mojom::EventMatcherPtr event_matcher, | 1453 ui::mojom::EventMatcherPtr event_matcher, |
| 1454 const base::Callback<void(bool)>& callback) { | 1454 const base::Callback<void(bool)>& callback) { |
| 1455 if (window_manager_internal_client_) { | 1455 if (window_manager_internal_client_) { |
| 1456 mojo::Array<ui::mojom::AcceleratorEventPtr> multi_accelerators; |
| 1457 ui::mojom::AcceleratorEventPtr accelerator_event( |
| 1458 ui::mojom::AcceleratorEvent::New()); |
| 1459 accelerator_event->id = id; |
| 1460 accelerator_event->event_matcher = std::move(event_matcher); |
| 1461 multi_accelerators.push_back(std::move(accelerator_event)); |
| 1456 window_manager_internal_client_->AddAccelerator( | 1462 window_manager_internal_client_->AddAccelerator( |
| 1457 id, std::move(event_matcher), callback); | 1463 std::move(multi_accelerators), callback); |
| 1464 ; |
| 1458 } | 1465 } |
| 1459 } | 1466 } |
| 1460 | 1467 |
| 1461 void WindowTreeClient::RemoveAccelerator(uint32_t id) { | 1468 void WindowTreeClient::RemoveAccelerator(uint32_t id) { |
| 1462 if (window_manager_internal_client_) { | 1469 if (window_manager_internal_client_) { |
| 1463 window_manager_internal_client_->RemoveAccelerator(id); | 1470 window_manager_internal_client_->RemoveAccelerator(id); |
| 1464 } | 1471 } |
| 1465 } | 1472 } |
| 1466 | 1473 |
| 1467 void WindowTreeClient::AddActivationParent(Window* window) { | 1474 void WindowTreeClient::AddActivationParent(Window* window) { |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1558 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1565 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
| 1559 this, capture_synchronizer_.get(), window)); | 1566 this, capture_synchronizer_.get(), window)); |
| 1560 } | 1567 } |
| 1561 | 1568 |
| 1562 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1569 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
| 1563 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1570 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
| 1564 this, focus_synchronizer_.get(), window)); | 1571 this, focus_synchronizer_.get(), window)); |
| 1565 } | 1572 } |
| 1566 | 1573 |
| 1567 } // namespace aura | 1574 } // namespace aura |
| OLD | NEW |