| Index: mash/wm/window_manager_application.h
|
| diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h
|
| index 20593df8b3dc605de000204fa991d1b905b52b81..f2878f5bc1b46e2ac1cd446f9decfcffc09efe1c 100644
|
| --- a/mash/wm/window_manager_application.h
|
| +++ b/mash/wm/window_manager_application.h
|
| @@ -16,6 +16,7 @@
|
| #include "components/mus/public/cpp/window_observer.h"
|
| #include "components/mus/public/cpp/window_tree_delegate.h"
|
| #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
|
| +#include "components/mus/public/interfaces/user_window_controller.mojom.h"
|
| #include "components/mus/public/interfaces/window_manager.mojom.h"
|
| #include "components/mus/public/interfaces/window_tree_host.mojom.h"
|
| #include "mash/wm/public/interfaces/container.mojom.h"
|
| @@ -50,6 +51,7 @@ class WindowManagerApplication
|
| public mus::mojom::WindowTreeHostClient,
|
| public mus::WindowTreeDelegate,
|
| public mojo::InterfaceFactory<mus::mojom::WindowManager>,
|
| + public mojo::InterfaceFactory<mus::mojom::UserWindowController>,
|
| public mojo::InterfaceFactory<mus::mojom::AcceleratorRegistrar> {
|
| public:
|
| WindowManagerApplication();
|
| @@ -96,6 +98,12 @@ class WindowManagerApplication
|
| mojo::ApplicationConnection* connection,
|
| mojo::InterfaceRequest<mus::mojom::WindowManager> request) override;
|
|
|
| + // InterfaceFactory<mus::mojom::UserWindowController>:
|
| + void Create(
|
| + mojo::ApplicationConnection* connection,
|
| + mojo::InterfaceRequest<mus::mojom::UserWindowController> request)
|
| + override;
|
| +
|
| // mus::WindowObserver:
|
| void OnWindowDestroyed(mus::Window* window) override;
|
|
|
| @@ -121,6 +129,11 @@ class WindowManagerApplication
|
| scoped_ptr<WindowManagerImpl> window_manager_;
|
| mojo::WeakBindingSet<mus::mojom::WindowManager> window_manager_binding_;
|
| ScopedVector<mojo::InterfaceRequest<mus::mojom::WindowManager>> requests_;
|
| + mojo::WeakBindingSet<mus::mojom::UserWindowController>
|
| + user_window_controller_binding_;
|
| + ScopedVector<mojo::InterfaceRequest<mus::mojom::UserWindowController>>
|
| + user_window_controller_requests_;
|
| +
|
|
|
| scoped_ptr<BackgroundLayout> background_layout_;
|
| scoped_ptr<ShelfLayout> shelf_layout_;
|
|
|