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 1573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1584 parent->StackChildAtTop(window->GetWindow()); | 1584 parent->StackChildAtTop(window->GetWindow()); |
1585 | 1585 |
1586 if (window_manager_internal_client_) | 1586 if (window_manager_internal_client_) |
1587 window_manager_internal_client_->WmResponse(wm_change_id, true); | 1587 window_manager_internal_client_->WmResponse(wm_change_id, true); |
1588 } | 1588 } |
1589 | 1589 |
1590 void WindowTreeClient::OnAccelerator(uint32_t ack_id, | 1590 void WindowTreeClient::OnAccelerator(uint32_t ack_id, |
1591 uint32_t accelerator_id, | 1591 uint32_t accelerator_id, |
1592 std::unique_ptr<ui::Event> event) { | 1592 std::unique_ptr<ui::Event> event) { |
1593 DCHECK(event); | 1593 DCHECK(event); |
1594 const ui::mojom::EventResult result = | 1594 std::unordered_map<std::string, std::vector<uint8_t>> properties; |
1595 window_manager_delegate_->OnAccelerator(accelerator_id, *event.get()); | 1595 const ui::mojom::EventResult result = window_manager_delegate_->OnAccelerator( |
| 1596 accelerator_id, *event.get(), &properties); |
1596 if (ack_id && window_manager_internal_client_) | 1597 if (ack_id && window_manager_internal_client_) |
1597 window_manager_internal_client_->OnAcceleratorAck(ack_id, result); | 1598 window_manager_internal_client_->OnAcceleratorAck(ack_id, result, |
| 1599 properties); |
1598 } | 1600 } |
1599 | 1601 |
1600 void WindowTreeClient::SetFrameDecorationValues( | 1602 void WindowTreeClient::SetFrameDecorationValues( |
1601 ui::mojom::FrameDecorationValuesPtr values) { | 1603 ui::mojom::FrameDecorationValuesPtr values) { |
1602 if (window_manager_internal_client_) { | 1604 if (window_manager_internal_client_) { |
1603 window_manager_internal_client_->WmSetFrameDecorationValues( | 1605 window_manager_internal_client_->WmSetFrameDecorationValues( |
1604 std::move(values)); | 1606 std::move(values)); |
1605 } | 1607 } |
1606 } | 1608 } |
1607 | 1609 |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1866 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1868 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
1867 this, capture_synchronizer_.get(), window)); | 1869 this, capture_synchronizer_.get(), window)); |
1868 } | 1870 } |
1869 | 1871 |
1870 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1872 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
1871 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1873 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
1872 this, focus_synchronizer_.get(), window)); | 1874 this, focus_synchronizer_.get(), window)); |
1873 } | 1875 } |
1874 | 1876 |
1875 } // namespace aura | 1877 } // namespace aura |
OLD | NEW |