OLD | NEW |
---|---|
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 #ifndef SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_ | 5 #ifndef SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_ |
6 #define SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_ | 6 #define SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 14 matching lines...) Expand all Loading... | |
25 void OpenNewWindow(); | 25 void OpenNewWindow(); |
26 | 26 |
27 // ui::demo::MusDemo: | 27 // ui::demo::MusDemo: |
28 void OnStartImpl() final; | 28 void OnStartImpl() final; |
29 std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() final; | 29 std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() final; |
30 | 30 |
31 // aura::WindowTreeClientDelegate: | 31 // aura::WindowTreeClientDelegate: |
32 void OnEmbed(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) final; | 32 void OnEmbed(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) final; |
33 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) final; | 33 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) final; |
34 | 34 |
35 mojom::WindowTreeHostFactoryPtr window_tree_host_factory_; | 35 mojom::WindowTreeHostFactoryPtr window_tree_host_factory_; |
fwang
2017/02/27 20:06:50
You can remove window_tree_host_factory_ too, I be
tonikitoo
2017/03/01 05:05:43
Done.
| |
36 mojom::WindowTreeClientPtr window_tree_client_mojo_; | |
37 size_t initialized_windows_count_ = 0; | 36 size_t initialized_windows_count_ = 0; |
38 | 37 |
39 DISALLOW_COPY_AND_ASSIGN(MusDemoExternal); | 38 DISALLOW_COPY_AND_ASSIGN(MusDemoExternal); |
40 }; | 39 }; |
41 | 40 |
42 } // namespace demo | 41 } // namespace demo |
43 } // namespace ui | 42 } // namespace ui |
44 | 43 |
45 #endif // SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_ | 44 #endif // SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_ |
OLD | NEW |