| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 tree_ = std::move(tree); | 277 tree_ = std::move(tree); |
| 278 connection_id_ = connection_id; | 278 connection_id_ = connection_id; |
| 279 tracker()->OnEmbed(connection_id, std::move(root)); | 279 tracker()->OnEmbed(connection_id, std::move(root)); |
| 280 if (embed_run_loop_) | 280 if (embed_run_loop_) |
| 281 embed_run_loop_->Quit(); | 281 embed_run_loop_->Quit(); |
| 282 } | 282 } |
| 283 void OnEmbeddedAppDisconnected(Id window_id) override { | 283 void OnEmbeddedAppDisconnected(Id window_id) override { |
| 284 tracker()->OnEmbeddedAppDisconnected(window_id); | 284 tracker()->OnEmbeddedAppDisconnected(window_id); |
| 285 } | 285 } |
| 286 void OnUnembed(Id window_id) override { tracker()->OnUnembed(window_id); } | 286 void OnUnembed(Id window_id) override { tracker()->OnUnembed(window_id); } |
| 287 void OnTopLevelCreated(uint32_t change_id, |
| 288 mojom::WindowDataPtr data) override { |
| 289 tracker()->OnTopLevelCreated(change_id, std::move(data)); |
| 290 } |
| 287 void OnWindowBoundsChanged(Id window_id, | 291 void OnWindowBoundsChanged(Id window_id, |
| 288 RectPtr old_bounds, | 292 RectPtr old_bounds, |
| 289 RectPtr new_bounds) override { | 293 RectPtr new_bounds) override { |
| 290 // The bounds of the root may change during startup on Android at random | 294 // The bounds of the root may change during startup on Android at random |
| 291 // times. As this doesn't matter, and shouldn't impact test exepctations, | 295 // times. As this doesn't matter, and shouldn't impact test exepctations, |
| 292 // it is ignored. | 296 // it is ignored. |
| 293 if (window_id == root_window_id_) | 297 if (window_id == root_window_id_) |
| 294 return; | 298 return; |
| 295 tracker()->OnWindowBoundsChanged(window_id, std::move(old_bounds), | 299 tracker()->OnWindowBoundsChanged(window_id, std::move(old_bounds), |
| 296 std::move(new_bounds)); | 300 std::move(new_bounds)); |
| (...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1771 // originating connection. | 1775 // originating connection. |
| 1772 | 1776 |
| 1773 // TODO(sky): make sure coverage of what was | 1777 // TODO(sky): make sure coverage of what was |
| 1774 // WindowManagerTest.SecondEmbedRoot_InitService and | 1778 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 1775 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 1779 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 1776 // manager | 1780 // manager |
| 1777 // tests. | 1781 // tests. |
| 1778 | 1782 |
| 1779 } // namespace ws | 1783 } // namespace ws |
| 1780 } // namespace mus | 1784 } // namespace mus |
| OLD | NEW |