| Index: ash/mus/window_manager_application.h
|
| diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
|
| index f5027c12ce4c34b0ea8536e633d8038495ae4351..7b6709a00e4222209108fe84d50d1750c7d42af2 100644
|
| --- a/ash/mus/window_manager_application.h
|
| +++ b/ash/mus/window_manager_application.h
|
| @@ -12,6 +12,7 @@
|
|
|
| #include "ash/public/interfaces/shelf.mojom.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "mash/session/public/interfaces/session.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| #include "mojo/public/cpp/bindings/binding_set.h"
|
| @@ -20,6 +21,10 @@
|
| #include "services/ui/common/types.h"
|
| #include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
|
|
|
| +namespace base {
|
| +class SequencedWorkerPool;
|
| +}
|
| +
|
| namespace chromeos {
|
| namespace system {
|
| class ScopedFakeStatisticsProvider;
|
| @@ -66,7 +71,8 @@ class WindowManagerApplication
|
| void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
|
|
|
| void InitWindowManager(
|
| - std::unique_ptr<ui::WindowTreeClient> window_tree_client);
|
| + std::unique_ptr<ui::WindowTreeClient> window_tree_client,
|
| + const scoped_refptr<base::SequencedWorkerPool>& blocking_pool);
|
|
|
| // shell::Service:
|
| void OnStart(const shell::Identity& identity) override;
|
| @@ -93,6 +99,9 @@ class WindowManagerApplication
|
| std::unique_ptr<views::SurfaceContextFactory> compositor_context_factory_;
|
| std::unique_ptr<WindowManager> window_manager_;
|
|
|
| + // A blocking pool used by the WindowManager's shell; not used in tests.
|
| + scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
|
| +
|
| mojo::BindingSet<ash::mojom::ShelfController> shelf_controller_bindings_;
|
|
|
| std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
|
|
|