| 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 { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 namespace ash { | 22 namespace ash { |
| 23 | 23 |
| 24 class ShellDelegate; | 24 class ShellDelegate; |
| 25 class ShellPort; | 25 class ShellPort; |
| 26 | 26 |
| 27 struct ASH_EXPORT ShellInitParams { | 27 struct ASH_EXPORT ShellInitParams { |
| 28 // Shell takes ownership of |shell_port|, if null ShellPortClassic is created. | 28 // Shell takes ownership of |shell_port|, if null ShellPortClassic is created. |
| 29 ShellPort* shell_port = nullptr; | 29 ShellPort* shell_port = nullptr; |
| 30 // Shell takes ownership of |primary_window_tree_host|. This is only used | 30 // Shell takes ownership of |primary_window_tree_host|. This is only used |
| 31 // by mash. | 31 // by mash. |
| 32 // TODO(sky): once simplified display management is enabled for mash this |
| 33 // should no longer be necessary. http://crbug.com/708287. |
| 32 aura::WindowTreeHostMus* primary_window_tree_host = nullptr; | 34 aura::WindowTreeHostMus* primary_window_tree_host = nullptr; |
| 33 ShellDelegate* delegate = nullptr; | 35 ShellDelegate* delegate = nullptr; |
| 34 ui::ContextFactory* context_factory = nullptr; | 36 ui::ContextFactory* context_factory = nullptr; |
| 35 ui::ContextFactoryPrivate* context_factory_private = nullptr; | 37 ui::ContextFactoryPrivate* context_factory_private = nullptr; |
| 36 base::SequencedWorkerPool* blocking_pool = nullptr; | 38 base::SequencedWorkerPool* blocking_pool = nullptr; |
| 37 }; | 39 }; |
| 38 | 40 |
| 39 } // namespace ash | 41 } // namespace ash |
| 40 | 42 |
| 41 #endif // ASH_SHELL_INIT_PARAMS_H_ | 43 #endif // ASH_SHELL_INIT_PARAMS_H_ |
| OLD | NEW |