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 #ifndef ASH_SHELL_INIT_PARAMS_H_ | 5 #ifndef ASH_SHELL_INIT_PARAMS_H_ |
6 #define ASH_SHELL_INIT_PARAMS_H_ | 6 #define ASH_SHELL_INIT_PARAMS_H_ |
7 | 7 |
8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
9 | 9 |
10 namespace aura { | 10 namespace aura { |
11 class WindowTreeHostMus; | 11 class WindowTreeHostMus; |
12 } | 12 } |
13 | 13 |
14 namespace base { | 14 namespace base { |
15 class SequencedWorkerPool; | 15 class SequencedWorkerPool; |
16 } | 16 } |
17 | 17 |
18 namespace ui { | 18 namespace ui { |
19 class ContextFactory; | 19 class ContextFactory; |
20 } | 20 } |
21 | 21 |
22 namespace ash { | 22 namespace ash { |
23 | 23 |
24 class ShellDelegate; | 24 class ShellDelegate; |
25 class ShellPort; | |
25 | 26 |
26 struct ASH_EXPORT ShellInitParams { | 27 struct ASH_EXPORT ShellInitParams { |
27 // Shell takes ownership of |wm_shell|, if null WmShellAura is created. | 28 // Shell takes ownership of |wm_shell|, if null ShellPortClassic is created. |
James Cook
2017/04/10 22:00:41
nit: |shell_port|. Also, is the next line still tr
sky
2017/04/10 22:16:25
Once ash is the default and the classic code isn't
| |
28 // TODO(sky): temporary, will eventually go away. | 29 // TODO(sky): temporary, will eventually go away. |
29 WmShell* wm_shell = nullptr; | 30 ShellPort* shell_port = nullptr; |
30 // Shell takes ownership of |primary_window_tree_host|. This is only used | 31 // Shell takes ownership of |primary_window_tree_host|. This is only used |
31 // by mash. | 32 // by mash. |
32 aura::WindowTreeHostMus* primary_window_tree_host = nullptr; | 33 aura::WindowTreeHostMus* primary_window_tree_host = nullptr; |
33 ShellDelegate* delegate = nullptr; | 34 ShellDelegate* delegate = nullptr; |
34 ui::ContextFactory* context_factory = nullptr; | 35 ui::ContextFactory* context_factory = nullptr; |
35 ui::ContextFactoryPrivate* context_factory_private = nullptr; | 36 ui::ContextFactoryPrivate* context_factory_private = nullptr; |
36 base::SequencedWorkerPool* blocking_pool = nullptr; | 37 base::SequencedWorkerPool* blocking_pool = nullptr; |
37 }; | 38 }; |
38 | 39 |
39 } // namespace ash | 40 } // namespace ash |
40 | 41 |
41 #endif // ASH_SHELL_INIT_PARAMS_H_ | 42 #endif // ASH_SHELL_INIT_PARAMS_H_ |
OLD | NEW |