| Index: services/ui/view_manager/view_manager_impl.cc
|
| diff --git a/services/ui/view_manager/view_manager_impl.cc b/services/ui/view_manager/view_manager_impl.cc
|
| index 7e443b211c1bb1050e4b85d8cc391b135b057bb3..8e38e880bb7cbcbdaa47a70af3fed48aa61ef057 100644
|
| --- a/services/ui/view_manager/view_manager_impl.cc
|
| +++ b/services/ui/view_manager/view_manager_impl.cc
|
| @@ -6,6 +6,8 @@
|
|
|
| #include <utility>
|
|
|
| +#include "base/bind.h"
|
| +
|
| #include "services/ui/view_manager/view_impl.h"
|
| #include "services/ui/view_manager/view_tree_impl.h"
|
|
|
| @@ -36,4 +38,22 @@ void ViewManagerImpl::CreateViewTree(
|
| label);
|
| }
|
|
|
| +// this should only really be called by trusted code (ie launcher) -- how to
|
| +// ensure that?
|
| +void ViewManagerImpl::RegisterViewAssociate(
|
| + mojo::InterfaceHandle<mojo::ui::ViewAssociate> view_associate,
|
| + const mojo::String& url) {
|
| + registry_->RegisterViewAssociate(
|
| + registry_, mojo::ui::ViewAssociatePtr::Create(std::move(view_associate)),
|
| + url, // should we really be passing this in like this?
|
| + base::Bind(&ViewManagerImpl::OnAssociateConnectionError,
|
| + base::Unretained(this)));
|
| +}
|
| +
|
| +// copied from ViewManagerImpl, is this a bad idea?
|
| +void ViewManagerImpl::OnAssociateConnectionError(const std::string& url) {
|
| + LOG(ERROR) << "Exiting due to view associate connection error: url=" << url;
|
| + // Shutdown();
|
| +}
|
| +
|
| } // namespace view_manager
|
|
|