| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "components/mus/public/cpp/tests/view_manager_test_base.h" | 8 #include "components/mus/public/cpp/tests/view_manager_test_base.h" |
| 9 #include "components/mus/public/cpp/util.h" | 9 #include "components/mus/public/cpp/util.h" |
| 10 #include "components/mus/public/cpp/view_observer.h" | 10 #include "components/mus/public/cpp/view_observer.h" |
| (...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 820 // Embed() from vm2 in vm3_v1. This is allowed as vm2 is an embed root, and | 820 // Embed() from vm2 in vm3_v1. This is allowed as vm2 is an embed root, and |
| 821 // further the callback should see the connection id. | 821 // further the callback should see the connection id. |
| 822 ASSERT_EQ(1u, vm2_v1->children().size()); | 822 ASSERT_EQ(1u, vm2_v1->children().size()); |
| 823 View* vm3_v1_in_vm2 = vm2_v1->children()[0]; | 823 View* vm3_v1_in_vm2 = vm2_v1->children()[0]; |
| 824 const EmbedResult result4 = Embed(vm3_v1_in_vm2); | 824 const EmbedResult result4 = Embed(vm3_v1_in_vm2); |
| 825 ASSERT_TRUE(result4.connection); | 825 ASSERT_TRUE(result4.connection); |
| 826 EXPECT_EQ(result4.connection_id, result4.connection->GetConnectionId()); | 826 EXPECT_EQ(result4.connection_id, result4.connection->GetConnectionId()); |
| 827 } | 827 } |
| 828 | 828 |
| 829 } // namespace mus | 829 } // namespace mus |
| OLD | NEW |