| Index: mojo/services/view_manager/view_manager_service_impl.h
|
| diff --git a/mojo/services/view_manager/view_manager_service_impl.h b/mojo/services/view_manager/view_manager_service_impl.h
|
| index 4d89b75c65928241a829a5377ddd11cf5354cc97..61186c82837873e255f525a74d73a14dea82f4ff 100644
|
| --- a/mojo/services/view_manager/view_manager_service_impl.h
|
| +++ b/mojo/services/view_manager/view_manager_service_impl.h
|
| @@ -47,10 +47,13 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
|
| ConnectionSpecificId creator_id,
|
| const std::string& creator_url,
|
| const std::string& url,
|
| - const ViewId& root_id,
|
| - InterfaceRequest<ServiceProvider> service_provider);
|
| + const ViewId& root_id);
|
| ~ViewManagerServiceImpl() override;
|
|
|
| + // Called after bound. |service_provider| is the ServiceProvider to pass to
|
| + // the client via OnEmbed().
|
| + void Init(InterfaceRequest<ServiceProvider> service_provider);
|
| +
|
| ConnectionSpecificId id() const { return id_; }
|
| ConnectionSpecificId creator_id() const { return creator_id_; }
|
| const std::string& url() const { return url_; }
|
| @@ -186,9 +189,6 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
|
| ServiceProviderPtr service_provider,
|
| const Callback<void(bool)>& callback) override;
|
|
|
| - // InterfaceImpl:
|
| - void OnConnectionEstablished() override;
|
| -
|
| // AccessPolicyDelegate:
|
| bool IsRootForAccessPolicy(const ViewId& id) const override;
|
| bool IsViewKnownForAccessPolicy(const ServerView* view) const override;
|
| @@ -224,8 +224,6 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
|
| // is destroyed or Embed() is invoked on the root.
|
| scoped_ptr<ViewId> root_;
|
|
|
| - InterfaceRequest<ServiceProvider> service_provider_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceImpl);
|
| };
|
|
|
|
|