| Index: components/view_manager/public/cpp/lib/view_manager_client_impl.h
|
| diff --git a/components/view_manager/public/cpp/lib/view_manager_client_impl.h b/components/view_manager/public/cpp/lib/view_manager_client_impl.h
|
| index b2e7f64da1f9c2f233cde29fa78303474191e07c..a4064e08197599686096f1ac4b0fc5e38b238256 100644
|
| --- a/components/view_manager/public/cpp/lib/view_manager_client_impl.h
|
| +++ b/components/view_manager/public/cpp/lib/view_manager_client_impl.h
|
| @@ -83,7 +83,6 @@ class ViewManagerClientImpl : public ViewManager,
|
| Id CreateViewOnServer();
|
|
|
| // Overridden from ViewManager:
|
| - const std::string& GetEmbedderURL() const override;
|
| View* GetRoot() override;
|
| View* GetViewById(Id id) override;
|
| View* GetFocusedView() override;
|
| @@ -92,16 +91,13 @@ class ViewManagerClientImpl : public ViewManager,
|
|
|
| // Overridden from ViewManagerClient:
|
| void OnEmbed(ConnectionSpecificId connection_id,
|
| - const String& creator_url,
|
| ViewDataPtr root,
|
| ViewManagerServicePtr view_manager_service,
|
| - InterfaceRequest<ServiceProvider> services,
|
| - ServiceProviderPtr exposed_services,
|
| Id focused_view_id) override;
|
| - void OnWillEmbed(Id view,
|
| - InterfaceRequest<ServiceProvider> services,
|
| - ServiceProviderPtr exposed_services,
|
| - const OnWillEmbedCallback& callback) override;
|
| + void OnEmbedForDescendant(
|
| + Id view,
|
| + mojo::URLRequestPtr request,
|
| + const OnEmbedForDescendantCallback& callback) override;
|
| void OnEmbeddedAppDisconnected(Id view_id) override;
|
| void OnViewBoundsChanged(Id view_id,
|
| RectPtr old_bounds,
|
| @@ -138,8 +134,6 @@ class ViewManagerClientImpl : public ViewManager,
|
| ConnectionSpecificId connection_id_;
|
| ConnectionSpecificId next_id_;
|
|
|
| - std::string creator_url_;
|
| -
|
| Callback<void(void)> change_acked_callback_;
|
|
|
| ViewManagerDelegate* delegate_;
|
|
|