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 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1273 } | 1273 } |
1274 | 1274 |
1275 void WindowTreeClient::WmNewDisplayAdded(const display::Display& display, | 1275 void WindowTreeClient::WmNewDisplayAdded(const display::Display& display, |
1276 ui::mojom::WindowDataPtr root_data, | 1276 ui::mojom::WindowDataPtr root_data, |
1277 bool parent_drawn) { | 1277 bool parent_drawn) { |
1278 WmNewDisplayAddedImpl(display, std::move(root_data), parent_drawn); | 1278 WmNewDisplayAddedImpl(display, std::move(root_data), parent_drawn); |
1279 } | 1279 } |
1280 | 1280 |
1281 void WindowTreeClient::WmDisplayRemoved(int64_t display_id) { | 1281 void WindowTreeClient::WmDisplayRemoved(int64_t display_id) { |
1282 DCHECK(window_manager_delegate_); | 1282 DCHECK(window_manager_delegate_); |
1283 // TODO: route to WindowTreeHost. | 1283 for (WindowMus* root : roots_) { |
1284 /* | 1284 DCHECK(root->GetWindow()->GetHost()); |
1285 for (Window* root : roots_) { | 1285 WindowTreeHostMus* window_tree_host = |
1286 if (root->display_id() == display_id) { | 1286 static_cast<WindowTreeHostMus*>(root->GetWindow()->GetHost()); |
1287 window_manager_delegate_->OnWmDisplayRemoved(root); | 1287 if (window_tree_host->display_id() == display_id) { |
| 1288 window_manager_delegate_->OnWmDisplayRemoved(window_tree_host); |
1288 return; | 1289 return; |
1289 } | 1290 } |
1290 } | 1291 } |
1291 */ | |
1292 } | 1292 } |
1293 | 1293 |
1294 void WindowTreeClient::WmDisplayModified(const display::Display& display) { | 1294 void WindowTreeClient::WmDisplayModified(const display::Display& display) { |
1295 DCHECK(window_manager_delegate_); | 1295 DCHECK(window_manager_delegate_); |
1296 // TODO(sky): this should likely route to WindowTreeHost. | 1296 // TODO(sky): this should likely route to WindowTreeHost. |
1297 window_manager_delegate_->OnWmDisplayModified(display); | 1297 window_manager_delegate_->OnWmDisplayModified(display); |
1298 } | 1298 } |
1299 | 1299 |
1300 void WindowTreeClient::WmSetBounds(uint32_t change_id, | 1300 void WindowTreeClient::WmSetBounds(uint32_t change_id, |
1301 Id window_id, | 1301 Id window_id, |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1530 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1530 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
1531 this, capture_synchronizer_.get(), window)); | 1531 this, capture_synchronizer_.get(), window)); |
1532 } | 1532 } |
1533 | 1533 |
1534 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1534 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
1535 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1535 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
1536 this, focus_synchronizer_.get(), window)); | 1536 this, focus_synchronizer_.get(), window)); |
1537 } | 1537 } |
1538 | 1538 |
1539 } // namespace aura | 1539 } // namespace aura |
OLD | NEW |