| 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/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "components/mus/public/interfaces/window_tree.mojom.h" | 9 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| 10 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 10 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 | 542 |
| 543 mojom::WindowTreeHostFactoryPtr factory; | 543 mojom::WindowTreeHostFactoryPtr factory; |
| 544 application_impl()->ConnectToService(request.Pass(), &factory); | 544 application_impl()->ConnectToService(request.Pass(), &factory); |
| 545 | 545 |
| 546 mojom::WindowTreeClientPtr tree_client_ptr; | 546 mojom::WindowTreeClientPtr tree_client_ptr; |
| 547 vm_client1_.reset(new TestWindowTreeClientImpl(application_impl())); | 547 vm_client1_.reset(new TestWindowTreeClientImpl(application_impl())); |
| 548 vm_client1_->Bind(GetProxy(&tree_client_ptr)); | 548 vm_client1_->Bind(GetProxy(&tree_client_ptr)); |
| 549 | 549 |
| 550 factory->CreateWindowTreeHost(GetProxy(&host_), | 550 factory->CreateWindowTreeHost(GetProxy(&host_), |
| 551 mojom::WindowTreeHostClientPtr(), | 551 mojom::WindowTreeHostClientPtr(), |
| 552 tree_client_ptr.Pass()); | 552 tree_client_ptr.Pass(), nullptr); |
| 553 | 553 |
| 554 // Next we should get an embed call on the "window manager" client. | 554 // Next we should get an embed call on the "window manager" client. |
| 555 vm_client1_->WaitForIncomingMethodCall(); | 555 vm_client1_->WaitForIncomingMethodCall(); |
| 556 | 556 |
| 557 ASSERT_EQ(1u, changes1()->size()); | 557 ASSERT_EQ(1u, changes1()->size()); |
| 558 EXPECT_EQ(CHANGE_TYPE_EMBED, (*changes1())[0].type); | 558 EXPECT_EQ(CHANGE_TYPE_EMBED, (*changes1())[0].type); |
| 559 // All these tests assume 1 for the client id. The only real assertion here | 559 // All these tests assume 1 for the client id. The only real assertion here |
| 560 // is the client id is not zero, but adding this as rest of code here | 560 // is the client id is not zero, but adding this as rest of code here |
| 561 // assumes 1. | 561 // assumes 1. |
| 562 ASSERT_GT((*changes1())[0].connection_id, 0); | 562 ASSERT_GT((*changes1())[0].connection_id, 0); |
| (...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1717 | 1717 |
| 1718 // TODO(sky): make sure coverage of what was | 1718 // TODO(sky): make sure coverage of what was |
| 1719 // WindowManagerTest.SecondEmbedRoot_InitService and | 1719 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 1720 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 1720 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 1721 // manager | 1721 // manager |
| 1722 // tests. | 1722 // tests. |
| 1723 | 1723 |
| 1724 } // namespace ws | 1724 } // namespace ws |
| 1725 | 1725 |
| 1726 } // namespace mus | 1726 } // namespace mus |
| OLD | NEW |