| Index: ash/shell_init_params.h
|
| diff --git a/ash/shell_init_params.h b/ash/shell_init_params.h
|
| index edca1f4d96e2e4756047c4b1720ce1bb7377194f..8cff2f1d9567887f8b82090d0f70789a3c9d61e4 100644
|
| --- a/ash/shell_init_params.h
|
| +++ b/ash/shell_init_params.h
|
| @@ -5,16 +5,7 @@
|
| #ifndef ASH_SHELL_INIT_PARAMS_H_
|
| #define ASH_SHELL_INIT_PARAMS_H_
|
|
|
| -#include <memory>
|
| -
|
| -#include "build/build_config.h"
|
| -
|
| -#if defined(OS_WIN)
|
| -#include <windows.h>
|
| -#endif
|
| -
|
| #include "ash/ash_export.h"
|
| -#include "base/callback.h"
|
|
|
| namespace base {
|
| class SequencedWorkerPool;
|
| @@ -26,26 +17,12 @@ class ContextFactory;
|
|
|
| namespace ash {
|
|
|
| -class KeyboardUI;
|
| class ShellDelegate;
|
|
|
| struct ASH_EXPORT ShellInitParams {
|
| - ShellInitParams();
|
| - ~ShellInitParams();
|
| -
|
| - ShellDelegate* delegate;
|
| -
|
| - ui::ContextFactory* context_factory;
|
| - base::SequencedWorkerPool* blocking_pool;
|
| -
|
| - // True if running inside mus.
|
| - bool in_mus = false;
|
| -
|
| - base::Callback<std::unique_ptr<KeyboardUI>()> keyboard_factory;
|
| -
|
| -#if defined(OS_WIN)
|
| - HWND remote_hwnd;
|
| -#endif
|
| + ShellDelegate* delegate = nullptr;
|
| + ui::ContextFactory* context_factory = nullptr;
|
| + base::SequencedWorkerPool* blocking_pool = nullptr;
|
| };
|
|
|
| } // namespace ash
|
|
|