| Index: ash/mus/window_manager_application.h
|
| diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
|
| index 7b6709a00e4222209108fe84d50d1750c7d42af2..ee8ac405d2ef8baaf5a4a20d71ca1239c9d013b5 100644
|
| --- a/ash/mus/window_manager_application.h
|
| +++ b/ash/mus/window_manager_application.h
|
| @@ -11,6 +11,7 @@
|
| #include <set>
|
|
|
| #include "ash/public/interfaces/shelf.mojom.h"
|
| +#include "ash/public/interfaces/wallpaper.mojom.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "mash/session/public/interfaces/session.mojom.h"
|
| @@ -50,10 +51,10 @@ class NativeWidgetFactoryMus;
|
| class WindowManager;
|
|
|
| // Hosts the window manager and the ash system user interface for mash.
|
| -// TODO(mash): Port ash_sysui's WallpaperController here.
|
| class WindowManagerApplication
|
| : public shell::Service,
|
| public shell::InterfaceFactory<ash::mojom::ShelfController>,
|
| + public shell::InterfaceFactory<ash::mojom::WallpaperController>,
|
| public shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>,
|
| public mash::session::mojom::ScreenlockStateListener {
|
| public:
|
| @@ -83,6 +84,10 @@ class WindowManagerApplication
|
| void Create(const shell::Identity& remote_identity,
|
| ash::mojom::ShelfControllerRequest request) override;
|
|
|
| + // InterfaceFactory<ash::mojom::WallpaperController>:
|
| + void Create(const shell::Identity& remote_identity,
|
| + ash::mojom::WallpaperControllerRequest request) override;
|
| +
|
| // shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>:
|
| void Create(const shell::Identity& remote_identity,
|
| ui::mojom::AcceleratorRegistrarRequest request) override;
|
| @@ -103,6 +108,8 @@ class WindowManagerApplication
|
| scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
|
|
|
| mojo::BindingSet<ash::mojom::ShelfController> shelf_controller_bindings_;
|
| + mojo::BindingSet<ash::mojom::WallpaperController>
|
| + wallpaper_controller_bindings_;
|
|
|
| std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
|
|
|
|
|