| Index: components/mus/example/wm/window_manager_application.h
|
| diff --git a/components/mus/example/wm/window_manager_application.h b/components/mus/example/wm/window_manager_application.h
|
| index 65be45952aebcf67ae62f12834594650ace6dcd8..635e10046d11df6e573be652e98c68d8ca035970 100644
|
| --- a/components/mus/example/wm/window_manager_application.h
|
| +++ b/components/mus/example/wm/window_manager_application.h
|
| @@ -21,9 +21,18 @@
|
| class BackgroundLayout;
|
| class ShelfLayout;
|
| class WindowLayout;
|
| -
|
| class WindowManagerImpl;
|
|
|
| +namespace ui {
|
| +namespace mojo {
|
| +class UIInit;
|
| +}
|
| +}
|
| +
|
| +namespace views {
|
| +class AuraInit;
|
| +}
|
| +
|
| class WindowManagerApplication
|
| : public mojo::ApplicationDelegate,
|
| public mus::WindowObserver,
|
| @@ -41,6 +50,8 @@ class WindowManagerApplication
|
| mus::Window* GetWindowForContainer(ash::mojom::Container container);
|
| mus::Window* GetWindowById(mus::Id id);
|
|
|
| + mojo::ApplicationImpl* app() { return app_; }
|
| +
|
| private:
|
| // ApplicationDelegate:
|
| void Initialize(mojo::ApplicationImpl* app) override;
|
| @@ -66,8 +77,13 @@ class WindowManagerApplication
|
| mus::Window* root_;
|
| int window_count_;
|
|
|
| + mojo::ApplicationImpl* app_;
|
| +
|
| mus::mojom::WindowTreeHostPtr host_;
|
|
|
| + scoped_ptr<ui::mojo::UIInit> ui_init_;
|
| + scoped_ptr<views::AuraInit> aura_init_;
|
| +
|
| // |window_manager_| is created once OnEmbed() is called. Until that time
|
| // |requests_| stores any pending WindowManager interface requests.
|
| scoped_ptr<WindowManagerImpl> window_manager_;
|
|
|