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 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1585 void WindowTreeClient::SetFrameDecorationValues( | 1585 void WindowTreeClient::SetFrameDecorationValues( |
1586 ui::mojom::FrameDecorationValuesPtr values) { | 1586 ui::mojom::FrameDecorationValuesPtr values) { |
1587 if (window_manager_internal_client_) { | 1587 if (window_manager_internal_client_) { |
1588 window_manager_internal_client_->WmSetFrameDecorationValues( | 1588 window_manager_internal_client_->WmSetFrameDecorationValues( |
1589 std::move(values)); | 1589 std::move(values)); |
1590 } | 1590 } |
1591 } | 1591 } |
1592 | 1592 |
1593 void WindowTreeClient::SetNonClientCursor(Window* window, | 1593 void WindowTreeClient::SetNonClientCursor(Window* window, |
1594 ui::mojom::Cursor cursor_id) { | 1594 ui::mojom::Cursor cursor_id) { |
1595 window_manager_internal_client_->WmSetNonClientCursor( | 1595 if (window_manager_internal_client_) { |
xiyuan
2017/03/17 07:08:16
Needed for WorkspaceLayoutManagerSoloTest.NotResiz
James Cook
2017/03/17 17:14:37
This seems fine -- we've checking it for null ever
| |
1596 WindowMus::Get(window)->server_id(), cursor_id); | 1596 window_manager_internal_client_->WmSetNonClientCursor( |
1597 WindowMus::Get(window)->server_id(), cursor_id); | |
1598 } | |
1597 } | 1599 } |
1598 | 1600 |
1599 void WindowTreeClient::AddAccelerators( | 1601 void WindowTreeClient::AddAccelerators( |
1600 std::vector<ui::mojom::WmAcceleratorPtr> accelerators, | 1602 std::vector<ui::mojom::WmAcceleratorPtr> accelerators, |
1601 const base::Callback<void(bool)>& callback) { | 1603 const base::Callback<void(bool)>& callback) { |
1602 if (window_manager_internal_client_) { | 1604 if (window_manager_internal_client_) { |
1603 window_manager_internal_client_->AddAccelerators(std::move(accelerators), | 1605 window_manager_internal_client_->AddAccelerators(std::move(accelerators), |
1604 callback); | 1606 callback); |
1605 } | 1607 } |
1606 } | 1608 } |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1849 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1851 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
1850 this, capture_synchronizer_.get(), window)); | 1852 this, capture_synchronizer_.get(), window)); |
1851 } | 1853 } |
1852 | 1854 |
1853 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1855 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
1854 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1856 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
1855 this, focus_synchronizer_.get(), window)); | 1857 this, focus_synchronizer_.get(), window)); |
1856 } | 1858 } |
1857 | 1859 |
1858 } // namespace aura | 1860 } // namespace aura |
OLD | NEW |