| 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 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1600 void WindowTreeClient::SetFrameDecorationValues( | 1600 void WindowTreeClient::SetFrameDecorationValues( |
| 1601 ui::mojom::FrameDecorationValuesPtr values) { | 1601 ui::mojom::FrameDecorationValuesPtr values) { |
| 1602 if (window_manager_internal_client_) { | 1602 if (window_manager_internal_client_) { |
| 1603 window_manager_internal_client_->WmSetFrameDecorationValues( | 1603 window_manager_internal_client_->WmSetFrameDecorationValues( |
| 1604 std::move(values)); | 1604 std::move(values)); |
| 1605 } | 1605 } |
| 1606 } | 1606 } |
| 1607 | 1607 |
| 1608 void WindowTreeClient::SetNonClientCursor(Window* window, | 1608 void WindowTreeClient::SetNonClientCursor(Window* window, |
| 1609 ui::mojom::Cursor cursor_id) { | 1609 ui::mojom::Cursor cursor_id) { |
| 1610 window_manager_internal_client_->WmSetNonClientCursor( | 1610 if (window_manager_internal_client_) { |
| 1611 WindowMus::Get(window)->server_id(), cursor_id); | 1611 window_manager_internal_client_->WmSetNonClientCursor( |
| 1612 WindowMus::Get(window)->server_id(), cursor_id); |
| 1613 } |
| 1612 } | 1614 } |
| 1613 | 1615 |
| 1614 void WindowTreeClient::AddAccelerators( | 1616 void WindowTreeClient::AddAccelerators( |
| 1615 std::vector<ui::mojom::WmAcceleratorPtr> accelerators, | 1617 std::vector<ui::mojom::WmAcceleratorPtr> accelerators, |
| 1616 const base::Callback<void(bool)>& callback) { | 1618 const base::Callback<void(bool)>& callback) { |
| 1617 if (window_manager_internal_client_) { | 1619 if (window_manager_internal_client_) { |
| 1618 window_manager_internal_client_->AddAccelerators(std::move(accelerators), | 1620 window_manager_internal_client_->AddAccelerators(std::move(accelerators), |
| 1619 callback); | 1621 callback); |
| 1620 } | 1622 } |
| 1621 } | 1623 } |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1864 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1866 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
| 1865 this, capture_synchronizer_.get(), window)); | 1867 this, capture_synchronizer_.get(), window)); |
| 1866 } | 1868 } |
| 1867 | 1869 |
| 1868 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1870 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
| 1869 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1871 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
| 1870 this, focus_synchronizer_.get(), window)); | 1872 this, focus_synchronizer_.get(), window)); |
| 1871 } | 1873 } |
| 1872 | 1874 |
| 1873 } // namespace aura | 1875 } // namespace aura |
| OLD | NEW |