| Index: services/ui/view_manager/view_registry.h
|
| diff --git a/services/ui/view_manager/view_registry.h b/services/ui/view_manager/view_registry.h
|
| index 9550e2953279887c9e9033cd00397a450249c57e..1b1e17cc32f6872a13bb7e8d2800f6696570ef4c 100644
|
| --- a/services/ui/view_manager/view_registry.h
|
| +++ b/services/ui/view_manager/view_registry.h
|
| @@ -31,14 +31,6 @@ class ViewRegistry : public mojo::ui::ViewInspector {
|
| explicit ViewRegistry(mojo::gfx::composition::CompositorPtr compositor);
|
| ~ViewRegistry() override;
|
|
|
| - // Begins connecting to the view associates.
|
| - // Invokes |connection_error_callback| if an associate connection fails
|
| - // and provides the associate's url.
|
| - void ConnectAssociates(
|
| - mojo::ApplicationImpl* app_impl,
|
| - const std::vector<std::string>& urls,
|
| - const AssociateConnectionErrorCallback& connection_error_callback);
|
| -
|
| // VIEW MANAGER REQUESTS
|
|
|
| // Creates a view and returns its ViewToken.
|
| @@ -54,6 +46,14 @@ class ViewRegistry : public mojo::ui::ViewInspector {
|
| mojo::ui::ViewTreeListenerPtr view_tree_listener,
|
| const mojo::String& label);
|
|
|
| + void RegisterViewAssociate(
|
| + mojo::ui::ViewInspector* view_inspector,
|
| + mojo::ui::ViewAssociatePtr view_associate,
|
| + mojo::InterfaceRequest<mojo::ui::ViewAssociateOwner> view_associate_owner,
|
| + const mojo::String& label);
|
| +
|
| + void FinishedRegisteringViewAssociates();
|
| +
|
| // VIEW STUB REQUESTS
|
|
|
| void OnViewResolved(ViewStub* view_stub, mojo::ui::ViewTokenPtr view_token);
|
|
|