| Index: mash/wm/root_window_controller.h
|
| diff --git a/mash/wm/root_window_controller.h b/mash/wm/root_window_controller.h
|
| index c70ac8311d696ad64d5a076dd21a798823674555..bacd5280f161d7398a3c17c065a98099e124e684 100644
|
| --- a/mash/wm/root_window_controller.h
|
| +++ b/mash/wm/root_window_controller.h
|
| @@ -56,11 +56,15 @@ class RootWindowController : public mus::WindowObserver,
|
| mus::Window* GetWindowById(mus::Id id);
|
| bool WindowIsContainer(const mus::Window* window) const;
|
|
|
| + WindowManager* window_manager() { return window_manager_.get(); }
|
| +
|
| // TODO(sky): don't expose this, it may be null.
|
| mus::mojom::WindowTreeHost* window_tree_host() {
|
| return window_tree_host_.get();
|
| }
|
|
|
| + void OnAccelerator(uint32_t id, mus::mojom::EventPtr event);
|
| +
|
| private:
|
| explicit RootWindowController(WindowManagerApplication* app);
|
| ~RootWindowController() override;
|
| @@ -70,9 +74,6 @@ class RootWindowController : public mus::WindowObserver,
|
| // Sets up the window containers used for z-space management.
|
| void CreateContainers();
|
|
|
| - // WindowTreeHostClient:
|
| - void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override;
|
| -
|
| // WindowTreeDelegate:
|
| void OnEmbed(mus::Window* root) override;
|
| void OnConnectionLost(mus::WindowTreeConnection* connection) override;
|
|
|