| 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 1676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1687 const ui::mojom::EventResult result = window_manager_delegate_->OnAccelerator( | 1687 const ui::mojom::EventResult result = window_manager_delegate_->OnAccelerator( |
| 1688 accelerator_id, *event.get(), &properties); | 1688 accelerator_id, *event.get(), &properties); |
| 1689 if (ack_id && window_manager_internal_client_) | 1689 if (ack_id && window_manager_internal_client_) |
| 1690 window_manager_internal_client_->OnAcceleratorAck(ack_id, result, | 1690 window_manager_internal_client_->OnAcceleratorAck(ack_id, result, |
| 1691 properties); | 1691 properties); |
| 1692 } | 1692 } |
| 1693 | 1693 |
| 1694 void WindowTreeClient::SetFrameDecorationValues( | 1694 void WindowTreeClient::SetFrameDecorationValues( |
| 1695 ui::mojom::FrameDecorationValuesPtr values) { | 1695 ui::mojom::FrameDecorationValuesPtr values) { |
| 1696 if (window_manager_internal_client_) { | 1696 if (window_manager_internal_client_) { |
| 1697 normal_client_area_insets_ = values->normal_client_area_insets; |
| 1697 window_manager_internal_client_->WmSetFrameDecorationValues( | 1698 window_manager_internal_client_->WmSetFrameDecorationValues( |
| 1698 std::move(values)); | 1699 std::move(values)); |
| 1699 } | 1700 } |
| 1700 } | 1701 } |
| 1701 | 1702 |
| 1702 void WindowTreeClient::SetNonClientCursor(Window* window, | 1703 void WindowTreeClient::SetNonClientCursor(Window* window, |
| 1703 ui::mojom::CursorType cursor_id) { | 1704 ui::mojom::CursorType cursor_id) { |
| 1704 if (window_manager_internal_client_) { | 1705 if (window_manager_internal_client_) { |
| 1705 window_manager_internal_client_->WmSetNonClientCursor( | 1706 window_manager_internal_client_->WmSetNonClientCursor( |
| 1706 WindowMus::Get(window)->server_id(), cursor_id); | 1707 WindowMus::Get(window)->server_id(), cursor_id); |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1960 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1961 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
| 1961 this, capture_synchronizer_.get(), window)); | 1962 this, capture_synchronizer_.get(), window)); |
| 1962 } | 1963 } |
| 1963 | 1964 |
| 1964 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1965 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
| 1965 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1966 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
| 1966 this, focus_synchronizer_.get(), window)); | 1967 this, focus_synchronizer_.get(), window)); |
| 1967 } | 1968 } |
| 1968 | 1969 |
| 1969 } // namespace aura | 1970 } // namespace aura |
| OLD | NEW |