Chromium Code Reviews| 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 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1442 if (!window) { | 1442 if (!window) { |
| 1443 window_manager_internal_client_->OnWmCreatedTopLevelWindow( | 1443 window_manager_internal_client_->OnWmCreatedTopLevelWindow( |
| 1444 change_id, kInvalidServerId); | 1444 change_id, kInvalidServerId); |
| 1445 return; | 1445 return; |
| 1446 } | 1446 } |
| 1447 embedded_windows_[requesting_client_id].insert(window); | 1447 embedded_windows_[requesting_client_id].insert(window); |
| 1448 if (window_manager_internal_client_) { | 1448 if (window_manager_internal_client_) { |
| 1449 window_manager_internal_client_->OnWmCreatedTopLevelWindow( | 1449 window_manager_internal_client_->OnWmCreatedTopLevelWindow( |
| 1450 change_id, WindowMus::Get(window)->server_id()); | 1450 change_id, WindowMus::Get(window)->server_id()); |
| 1451 } | 1451 } |
| 1452 auto activatable_iter = | |
|
sky
2017/01/23 21:28:29
The WindowManagerDelegate should be responsible fo
Hadi
2017/01/24 18:42:32
Done. Implementation of WindowManagerDelegate::OnW
| |
| 1453 properties.find(ui::mojom::WindowManager::kActivatable_InitProperty); | |
| 1454 if (activatable_iter != properties.end()) | |
| 1455 SetCanFocus(window, mojo::ConvertTo<bool>(activatable_iter->second)); | |
| 1452 } | 1456 } |
| 1453 | 1457 |
| 1454 void WindowTreeClient::WmClientJankinessChanged(ClientSpecificId client_id, | 1458 void WindowTreeClient::WmClientJankinessChanged(ClientSpecificId client_id, |
| 1455 bool janky) { | 1459 bool janky) { |
| 1456 if (window_manager_delegate_) { | 1460 if (window_manager_delegate_) { |
| 1457 auto it = embedded_windows_.find(client_id); | 1461 auto it = embedded_windows_.find(client_id); |
| 1458 CHECK(it != embedded_windows_.end()); | 1462 CHECK(it != embedded_windows_.end()); |
| 1459 window_manager_delegate_->OnWmClientJankinessChanged( | 1463 window_manager_delegate_->OnWmClientJankinessChanged( |
| 1460 embedded_windows_[client_id], janky); | 1464 embedded_windows_[client_id], janky); |
| 1461 } | 1465 } |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1751 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1755 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
| 1752 this, capture_synchronizer_.get(), window)); | 1756 this, capture_synchronizer_.get(), window)); |
| 1753 } | 1757 } |
| 1754 | 1758 |
| 1755 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1759 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
| 1756 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1760 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
| 1757 this, focus_synchronizer_.get(), window)); | 1761 this, focus_synchronizer_.get(), window)); |
| 1758 } | 1762 } |
| 1759 | 1763 |
| 1760 } // namespace aura | 1764 } // namespace aura |
| OLD | NEW |