| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "services/ui/view_manager/view_manager_impl.h" | 5 #include "services/ui/view_manager/view_manager_impl.h" |
| 6 | 6 |
| 7 #include "services/ui/view_manager/view_host_impl.h" | 7 #include "services/ui/view_manager/view_host_impl.h" |
| 8 #include "services/ui/view_manager/view_tree_host_impl.h" | 8 #include "services/ui/view_manager/view_tree_host_impl.h" |
| 9 | 9 |
| 10 namespace view_manager { | 10 namespace view_manager { |
| 11 | 11 |
| 12 ViewManagerImpl::ViewManagerImpl(ViewRegistry* registry) | 12 ViewManagerImpl::ViewManagerImpl(ViewRegistry* registry) |
| 13 : registry_(registry) {} | 13 : registry_(registry) {} |
| 14 | 14 |
| 15 ViewManagerImpl::~ViewManagerImpl() {} | 15 ViewManagerImpl::~ViewManagerImpl() {} |
| 16 | 16 |
| 17 void ViewManagerImpl::RegisterView( | 17 void ViewManagerImpl::RegisterView( |
| 18 mojo::ui::ViewPtr view, | 18 mojo::InterfaceHandle<mojo::ui::View> view, |
| 19 mojo::InterfaceRequest<mojo::ui::ViewHost> view_host_request, | 19 mojo::InterfaceRequest<mojo::ui::ViewHost> view_host_request, |
| 20 const mojo::String& label, | 20 const mojo::String& label, |
| 21 const RegisterViewCallback& callback) { | 21 const RegisterViewCallback& callback) { |
| 22 mojo::ui::ViewTokenPtr view_token = | 22 mojo::ui::ViewTokenPtr view_token = registry_->RegisterView( |
| 23 registry_->RegisterView(view.Pass(), view_host_request.Pass(), label); | 23 mojo::ui::ViewPtr::Create(view.Pass()), view_host_request.Pass(), label); |
| 24 callback.Run(view_token.Pass()); | 24 callback.Run(view_token.Pass()); |
| 25 } | 25 } |
| 26 | 26 |
| 27 void ViewManagerImpl::RegisterViewTree( | 27 void ViewManagerImpl::RegisterViewTree( |
| 28 mojo::ui::ViewTreePtr view_tree, | 28 mojo::InterfaceHandle<mojo::ui::ViewTree> view_tree, |
| 29 mojo::InterfaceRequest<mojo::ui::ViewTreeHost> view_tree_host_request, | 29 mojo::InterfaceRequest<mojo::ui::ViewTreeHost> view_tree_host_request, |
| 30 const mojo::String& label, | 30 const mojo::String& label, |
| 31 const RegisterViewTreeCallback& callback) { | 31 const RegisterViewTreeCallback& callback) { |
| 32 mojo::ui::ViewTreeTokenPtr view_tree_token = registry_->RegisterViewTree( | 32 mojo::ui::ViewTreeTokenPtr view_tree_token = registry_->RegisterViewTree( |
| 33 view_tree.Pass(), view_tree_host_request.Pass(), label); | 33 mojo::ui::ViewTreePtr::Create(view_tree.Pass()), |
| 34 view_tree_host_request.Pass(), label); |
| 34 callback.Run(view_tree_token.Pass()); | 35 callback.Run(view_tree_token.Pass()); |
| 35 } | 36 } |
| 36 | 37 |
| 37 } // namespace view_manager | 38 } // namespace view_manager |
| OLD | NEW |