| 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 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1415 | 1415 |
| 1416 bool valid_wait = true; | 1416 bool valid_wait = true; |
| 1417 // TODO(sky): having to block here is not ideal. http://crbug.com/594852. | 1417 // TODO(sky): having to block here is not ideal. http://crbug.com/594852. |
| 1418 while (!got_initial_displays_ && valid_wait) | 1418 while (!got_initial_displays_ && valid_wait) |
| 1419 valid_wait = binding_.WaitForIncomingMethodCall(); | 1419 valid_wait = binding_.WaitForIncomingMethodCall(); |
| 1420 return valid_wait; | 1420 return valid_wait; |
| 1421 } | 1421 } |
| 1422 | 1422 |
| 1423 void WindowTreeClient::OnConnect(ClientSpecificId client_id) { | 1423 void WindowTreeClient::OnConnect(ClientSpecificId client_id) { |
| 1424 client_id_ = client_id; | 1424 client_id_ = client_id; |
| 1425 if (window_manager_delegate_) |
| 1426 window_manager_delegate_->OnWmConnected(); |
| 1425 } | 1427 } |
| 1426 | 1428 |
| 1427 void WindowTreeClient::WmNewDisplayAdded( | 1429 void WindowTreeClient::WmNewDisplayAdded( |
| 1428 const display::Display& display, | 1430 const display::Display& display, |
| 1429 ui::mojom::WindowDataPtr root_data, | 1431 ui::mojom::WindowDataPtr root_data, |
| 1430 bool parent_drawn, | 1432 bool parent_drawn, |
| 1431 const cc::FrameSinkId& frame_sink_id, | 1433 const cc::FrameSinkId& frame_sink_id, |
| 1432 const base::Optional<cc::LocalSurfaceId>& local_surface_id) { | 1434 const base::Optional<cc::LocalSurfaceId>& local_surface_id) { |
| 1433 WmNewDisplayAddedImpl(display, std::move(root_data), parent_drawn, | 1435 WmNewDisplayAddedImpl(display, std::move(root_data), parent_drawn, |
| 1434 frame_sink_id, local_surface_id); | 1436 frame_sink_id, local_surface_id); |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1963 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1965 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
| 1964 this, capture_synchronizer_.get(), window)); | 1966 this, capture_synchronizer_.get(), window)); |
| 1965 } | 1967 } |
| 1966 | 1968 |
| 1967 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1969 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
| 1968 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1970 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
| 1969 this, focus_synchronizer_.get(), window)); | 1971 this, focus_synchronizer_.get(), window)); |
| 1970 } | 1972 } |
| 1971 | 1973 |
| 1972 } // namespace aura | 1974 } // namespace aura |
| OLD | NEW |