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 fa668689b46fbc2f304e04554c4b1f7239bbfadb..fd76313f0366e90402023b9ccc0eb35f5f393f8f 100644 |
--- a/services/ui/view_manager/view_manager_impl.cc |
+++ b/services/ui/view_manager/view_manager_impl.cc |
@@ -4,6 +4,8 @@ |
#include "services/ui/view_manager/view_manager_impl.h" |
+#include <utility> |
+ |
#include "services/ui/view_manager/view_host_impl.h" |
#include "services/ui/view_manager/view_tree_host_impl.h" |
@@ -15,22 +17,24 @@ ViewManagerImpl::ViewManagerImpl(ViewRegistry* registry) |
ViewManagerImpl::~ViewManagerImpl() {} |
void ViewManagerImpl::RegisterView( |
- mojo::ui::ViewPtr view, |
+ mojo::InterfaceHandle<mojo::ui::View> view, |
mojo::InterfaceRequest<mojo::ui::ViewHost> view_host_request, |
const mojo::String& label, |
const RegisterViewCallback& callback) { |
mojo::ui::ViewTokenPtr view_token = |
- registry_->RegisterView(view.Pass(), view_host_request.Pass(), label); |
+ registry_->RegisterView(mojo::ui::ViewPtr::Create(std::move(view)), |
+ view_host_request.Pass(), label); |
callback.Run(view_token.Pass()); |
} |
void ViewManagerImpl::RegisterViewTree( |
- mojo::ui::ViewTreePtr view_tree, |
+ mojo::InterfaceHandle<mojo::ui::ViewTree> view_tree, |
mojo::InterfaceRequest<mojo::ui::ViewTreeHost> view_tree_host_request, |
const mojo::String& label, |
const RegisterViewTreeCallback& callback) { |
mojo::ui::ViewTreeTokenPtr view_tree_token = registry_->RegisterViewTree( |
- view_tree.Pass(), view_tree_host_request.Pass(), label); |
+ mojo::ui::ViewTreePtr::Create(std::move(view_tree)), |
+ view_tree_host_request.Pass(), label); |
callback.Run(view_tree_token.Pass()); |
} |