| Index: mash/wm/root_window_controller.h
|
| diff --git a/mash/wm/root_window_controller.h b/mash/wm/root_window_controller.h
|
| index 767317332eca9d5ca0e60027f74ee86b8abfb8e2..b1f0291ce2965b53adef191489742963c60f07a6 100644
|
| --- a/mash/wm/root_window_controller.h
|
| +++ b/mash/wm/root_window_controller.h
|
| @@ -12,6 +12,7 @@
|
| #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
|
| #include "components/mus/public/interfaces/window_tree_host.mojom.h"
|
| #include "mash/wm/public/interfaces/container.mojom.h"
|
| +#include "mash/wm/shelf_layout_manager_delegate.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| #include "ui/display/display.h"
|
|
|
| @@ -50,7 +51,8 @@ class WmTestHelper;
|
| // RootWindowController deletes itself when the root mus::Window is destroyed.
|
| // You can trigger deletion explicitly by way of Destroy().
|
| class RootWindowController : public mus::WindowObserver,
|
| - public mus::WindowTreeDelegate {
|
| + public mus::WindowTreeDelegate,
|
| + public ShelfLayoutManagerDelegate {
|
| public:
|
| static RootWindowController* CreateFromDisplay(
|
| WindowManagerApplication* app,
|
| @@ -104,6 +106,9 @@ class RootWindowController : public mus::WindowObserver,
|
| // mus::WindowObserver:
|
| void OnWindowDestroyed(mus::Window* window) override;
|
|
|
| + // ShelfLayoutManagerDelegate:
|
| + void OnShelfWindowAvailable() override;
|
| +
|
| // Sets up the window containers used for z-space management.
|
| void CreateContainer(mash::wm::mojom::Container container,
|
| mash::wm::mojom::Container parent_container);
|
|
|