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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 registry->AddInterface(client_factory_.get()); | 629 registry->AddInterface(client_factory_.get()); |
630 return true; | 630 return true; |
631 } | 631 } |
632 | 632 |
633 void SetUp() override { | 633 void SetUp() override { |
634 client_factory_ = base::MakeUnique<WindowTreeClientFactory>(); | 634 client_factory_ = base::MakeUnique<WindowTreeClientFactory>(); |
635 | 635 |
636 WindowServerServiceTestBase::SetUp(); | 636 WindowServerServiceTestBase::SetUp(); |
637 | 637 |
638 mojom::WindowTreeHostFactoryPtr factory; | 638 mojom::WindowTreeHostFactoryPtr factory; |
639 connector()->ConnectToInterface("mojo:ui", &factory); | 639 connector()->ConnectToInterface("service:ui", &factory); |
640 | 640 |
641 mojom::WindowTreeClientPtr tree_client_ptr; | 641 mojom::WindowTreeClientPtr tree_client_ptr; |
642 wt_client1_ = base::MakeUnique<TestWindowTreeClient>(); | 642 wt_client1_ = base::MakeUnique<TestWindowTreeClient>(); |
643 wt_client1_->Bind(GetProxy(&tree_client_ptr)); | 643 wt_client1_->Bind(GetProxy(&tree_client_ptr)); |
644 | 644 |
645 factory->CreateWindowTreeHost(GetProxy(&host_), | 645 factory->CreateWindowTreeHost(GetProxy(&host_), |
646 std::move(tree_client_ptr)); | 646 std::move(tree_client_ptr)); |
647 | 647 |
648 // Next we should get an embed call on the "window manager" client. | 648 // Next we should get an embed call on the "window manager" client. |
649 wt_client1_->WaitForOnEmbed(); | 649 wt_client1_->WaitForOnEmbed(); |
(...skipping 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2118 | 2118 |
2119 // TODO(sky): make sure coverage of what was | 2119 // TODO(sky): make sure coverage of what was |
2120 // WindowManagerTest.SecondEmbedRoot_InitService and | 2120 // WindowManagerTest.SecondEmbedRoot_InitService and |
2121 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 2121 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
2122 // manager | 2122 // manager |
2123 // tests. | 2123 // tests. |
2124 | 2124 |
2125 } // namespace test | 2125 } // namespace test |
2126 } // namespace ws | 2126 } // namespace ws |
2127 } // namespace ui | 2127 } // namespace ui |
OLD | NEW |