Chromium Code Reviews| Index: services/ui/view_manager/view_registry.cc |
| diff --git a/services/ui/view_manager/view_registry.cc b/services/ui/view_manager/view_registry.cc |
| index aee3a466f8af2e4d34c76db26fa1c66fc8244d83..1a70f73589705a47de43b3a59754dda9f66fed6f 100644 |
| --- a/services/ui/view_manager/view_registry.cc |
| +++ b/services/ui/view_manager/view_registry.cc |
| @@ -59,14 +59,21 @@ ViewRegistry::ViewRegistry(mojo::gfx::composition::CompositorPtr compositor) |
| ViewRegistry::~ViewRegistry() {} |
| -void ViewRegistry::ConnectAssociates( |
| - mojo::ApplicationImpl* app_impl, |
| - const std::vector<std::string>& urls, |
| - const AssociateConnectionErrorCallback& connection_error_callback) { |
| - associate_table_.ConnectAssociates(app_impl, this, urls, |
| - connection_error_callback); |
| +// REGISTERING ASSOCIATES |
| + |
| +void ViewRegistry::RegisterViewAssociate( |
| + mojo::ui::ViewInspector* view_inspector, |
| + mojo::ui::ViewAssociatePtr view_associate, |
| + mojo::InterfaceRequest<mojo::ui::ViewAssociateOwner> view_associate_owner, |
| + const mojo::String& label) { |
| + associate_table_.RegisterViewAssociate(view_inspector, view_associate.Pass(), |
|
jeffbrown
2016/05/18 18:07:16
Please sanitize the label here before using it. S
mikejurka
2016/05/18 19:09:10
Done.
|
| + view_associate_owner.Pass(), label); |
| } |
| +void ViewRegistry::FinishedRegisteringViewAssociates() { |
| + associate_table_.FinishedRegisteringViewAssociates(); |
| +}; |
| + |
| // CREATE / DESTROY VIEWS |
| void ViewRegistry::CreateView( |