| Index: services/ui/launcher/launch_instance.h
|
| diff --git a/services/ui/launcher/launch_instance.h b/services/ui/launcher/launch_instance.h
|
| index 644f31dbb817a44cc35e0c8f5f037bbbdb9eeb69..948a09d3553dc490749c5d115ecb9fa05150205b 100644
|
| --- a/services/ui/launcher/launch_instance.h
|
| +++ b/services/ui/launcher/launch_instance.h
|
| @@ -24,11 +24,14 @@ class LaunchInstance : public mojo::NativeViewportEventDispatcher {
|
| public:
|
| LaunchInstance(mojo::ApplicationImpl* app_impl,
|
| const std::string& app_url,
|
| + const std::string& view_associates_urls,
|
| const base::Closure& shutdown_callback);
|
| ~LaunchInstance() override;
|
|
|
| void Launch();
|
|
|
| + void OnViewAssociateConnectionError();
|
| +
|
| private:
|
| // |NativeViewportEventDispatcher|:
|
| void OnEvent(mojo::EventPtr event,
|
| @@ -45,6 +48,7 @@ class LaunchInstance : public mojo::NativeViewportEventDispatcher {
|
|
|
| mojo::ApplicationImpl* app_impl_;
|
| std::string app_url_;
|
| + std::string view_associate_urls_;
|
| base::Closure shutdown_callback_;
|
|
|
| mojo::gfx::composition::CompositorPtr compositor_;
|
| @@ -56,6 +60,8 @@ class LaunchInstance : public mojo::NativeViewportEventDispatcher {
|
|
|
| std::unique_ptr<LauncherViewTree> view_tree_;
|
|
|
| + std::vector<mojo::ui::ViewAssociateOwnerPtr> view_associate_owners_;
|
| +
|
| mojo::ui::ViewOwnerPtr client_view_owner_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LaunchInstance);
|
|
|