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 "mojo/ui/view_provider_app.h" | 5 #include "mojo/ui/view_provider_app.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/command_line.h" | 9 #include "base/command_line.h" |
8 #include "base/logging.h" | 10 #include "base/logging.h" |
9 | 11 |
10 namespace mojo { | 12 namespace mojo { |
11 namespace ui { | 13 namespace ui { |
12 | 14 |
13 class ViewProviderApp::DelegatingViewProvider : public mojo::ui::ViewProvider { | 15 class ViewProviderApp::DelegatingViewProvider : public mojo::ui::ViewProvider { |
14 public: | 16 public: |
15 DelegatingViewProvider(ViewProviderApp* app, | 17 DelegatingViewProvider(ViewProviderApp* app, |
16 const std::string& view_provider_url) | 18 const std::string& view_provider_url) |
17 : app_(app), view_provider_url_(view_provider_url) {} | 19 : app_(app), view_provider_url_(view_provider_url) {} |
18 | 20 |
19 ~DelegatingViewProvider() override {} | 21 ~DelegatingViewProvider() override {} |
20 | 22 |
21 private: | 23 private: |
22 // |ViewProvider|: | 24 // |ViewProvider|: |
23 void CreateView( | 25 void CreateView( |
24 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 26 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
25 mojo::ServiceProviderPtr exposed_services, | 27 mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services, |
26 const mojo::ui::ViewProvider::CreateViewCallback& callback) override { | 28 const mojo::ui::ViewProvider::CreateViewCallback& callback) override { |
27 app_->CreateView(this, view_provider_url_, services.Pass(), | 29 app_->CreateView(this, view_provider_url_, services.Pass(), |
28 exposed_services.Pass(), callback); | 30 std::move(exposed_services), callback); |
29 } | 31 } |
30 | 32 |
31 ViewProviderApp* app_; | 33 ViewProviderApp* app_; |
32 std::string view_provider_url_; | 34 std::string view_provider_url_; |
33 | 35 |
34 MOJO_DISALLOW_COPY_AND_ASSIGN(DelegatingViewProvider); | 36 MOJO_DISALLOW_COPY_AND_ASSIGN(DelegatingViewProvider); |
35 }; | 37 }; |
36 | 38 |
37 ViewProviderApp::ViewProviderApp() {} | 39 ViewProviderApp::ViewProviderApp() {} |
38 | 40 |
(...skipping 20 matching lines...) Expand all Loading... |
59 mojo::InterfaceRequest<mojo::ui::ViewProvider> request) { | 61 mojo::InterfaceRequest<mojo::ui::ViewProvider> request) { |
60 bindings_.AddBinding( | 62 bindings_.AddBinding( |
61 new DelegatingViewProvider(this, connection->GetConnectionURL()), | 63 new DelegatingViewProvider(this, connection->GetConnectionURL()), |
62 request.Pass()); | 64 request.Pass()); |
63 } | 65 } |
64 | 66 |
65 void ViewProviderApp::CreateView( | 67 void ViewProviderApp::CreateView( |
66 DelegatingViewProvider* provider, | 68 DelegatingViewProvider* provider, |
67 const std::string& view_provider_url, | 69 const std::string& view_provider_url, |
68 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 70 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
69 mojo::ServiceProviderPtr exposed_services, | 71 mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services, |
70 const mojo::ui::ViewProvider::CreateViewCallback& callback) { | 72 const mojo::ui::ViewProvider::CreateViewCallback& callback) { |
71 if (!CreateView(view_provider_url, services.Pass(), exposed_services.Pass(), | 73 if (!CreateView(view_provider_url, services.Pass(), |
72 callback)) { | 74 std::move(exposed_services), callback)) { |
73 bindings_.RemoveBindings(provider); | 75 bindings_.RemoveBindings(provider); |
74 delete provider; | 76 delete provider; |
75 } | 77 } |
76 } | 78 } |
77 | 79 |
78 } // namespace ui | 80 } // namespace ui |
79 } // namespace mojo | 81 } // namespace mojo |
OLD | NEW |