OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/mus/public/cpp/window_tree_host_factory.h" | 5 #include "components/mus/public/cpp/window_tree_host_factory.h" |
6 | 6 |
7 #include "components/mus/public/cpp/window_tree_connection.h" | 7 #include "components/mus/public/cpp/window_tree_client.h" |
8 #include "components/mus/public/cpp/window_tree_delegate.h" | 8 #include "components/mus/public/cpp/window_tree_client_delegate.h" |
9 #include "services/shell/public/cpp/connector.h" | 9 #include "services/shell/public/cpp/connector.h" |
10 | 10 |
11 namespace mus { | 11 namespace mus { |
12 | 12 |
13 void CreateWindowTreeHost(mojom::WindowTreeHostFactory* factory, | 13 void CreateWindowTreeHost(mojom::WindowTreeHostFactory* factory, |
14 WindowTreeDelegate* delegate, | 14 WindowTreeClientDelegate* delegate, |
15 mojom::WindowTreeHostPtr* host, | 15 mojom::WindowTreeHostPtr* host, |
16 WindowManagerDelegate* window_manager_delegate) { | 16 WindowManagerDelegate* window_manager_delegate) { |
17 mojom::WindowTreeClientPtr tree_client; | 17 mojom::WindowTreeClientPtr tree_client; |
18 WindowTreeConnection::CreateForWindowManager( | 18 new WindowTreeClient(delegate, window_manager_delegate, |
19 delegate, GetProxy(&tree_client), | 19 GetProxy(&tree_client)); |
20 WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED, | |
21 window_manager_delegate); | |
22 factory->CreateWindowTreeHost(GetProxy(host), std::move(tree_client)); | 20 factory->CreateWindowTreeHost(GetProxy(host), std::move(tree_client)); |
23 } | 21 } |
24 | 22 |
25 void CreateWindowTreeHost(shell::Connector* connector, | 23 void CreateWindowTreeHost(shell::Connector* connector, |
26 WindowTreeDelegate* delegate, | 24 WindowTreeClientDelegate* delegate, |
27 mojom::WindowTreeHostPtr* host, | 25 mojom::WindowTreeHostPtr* host, |
28 WindowManagerDelegate* window_manager_delegate) { | 26 WindowManagerDelegate* window_manager_delegate) { |
29 mojom::WindowTreeHostFactoryPtr factory; | 27 mojom::WindowTreeHostFactoryPtr factory; |
30 connector->ConnectToInterface("mojo:mus", &factory); | 28 connector->ConnectToInterface("mojo:mus", &factory); |
31 CreateWindowTreeHost(factory.get(), delegate, host, window_manager_delegate); | 29 CreateWindowTreeHost(factory.get(), delegate, host, window_manager_delegate); |
32 } | 30 } |
33 | 31 |
34 } // namespace mus | 32 } // namespace mus |
OLD | NEW |