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 "content/browser/service_manager/service_manager_context.h" | 5 #include "content/browser/service_manager/service_manager_context.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 friend class base::RefCountedThreadSafe<InProcessServiceManagerContext>; | 204 friend class base::RefCountedThreadSafe<InProcessServiceManagerContext>; |
205 | 205 |
206 ~InProcessServiceManagerContext() {} | 206 ~InProcessServiceManagerContext() {} |
207 | 207 |
208 void StartOnIOThread( | 208 void StartOnIOThread( |
209 std::unique_ptr<BuiltinManifestProvider> manifest_provider, | 209 std::unique_ptr<BuiltinManifestProvider> manifest_provider, |
210 service_manager::mojom::ServicePtrInfo embedder_service_proxy_info) { | 210 service_manager::mojom::ServicePtrInfo embedder_service_proxy_info) { |
211 manifest_provider_ = std::move(manifest_provider); | 211 manifest_provider_ = std::move(manifest_provider); |
212 | 212 |
213 base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool(); | 213 base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool(); |
214 catalog_ = base::MakeUnique<catalog::Catalog>( | 214 catalog_.reset( |
215 blocking_pool, nullptr, manifest_provider_.get()); | 215 new catalog::Catalog(blocking_pool, manifest_provider_.get())); |
216 service_manager_ = base::MakeUnique<service_manager::ServiceManager>( | 216 service_manager_ = base::MakeUnique<service_manager::ServiceManager>( |
217 base::MakeUnique<NullServiceProcessLauncherFactory>(), | 217 base::MakeUnique<NullServiceProcessLauncherFactory>(), |
218 catalog_->TakeService()); | 218 catalog_->TakeService()); |
219 | 219 |
220 service_manager::mojom::ServiceRequest request = | 220 service_manager::mojom::ServiceRequest request = |
221 service_manager_->StartEmbedderService(mojom::kBrowserServiceName); | 221 service_manager_->StartEmbedderService(mojom::kBrowserServiceName); |
222 mojo::FuseInterface( | 222 mojo::FuseInterface( |
223 std::move(request), std::move(embedder_service_proxy_info)); | 223 std::move(request), std::move(embedder_service_proxy_info)); |
224 } | 224 } |
225 | 225 |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 base::Bind(&DestroyConnectorOnIOThread)); | 330 base::Bind(&DestroyConnectorOnIOThread)); |
331 } | 331 } |
332 | 332 |
333 // static | 333 // static |
334 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { | 334 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { |
335 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 335 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
336 return g_io_thread_connector.Get().get(); | 336 return g_io_thread_connector.Get().get(); |
337 } | 337 } |
338 | 338 |
339 } // namespace content | 339 } // namespace content |
OLD | NEW |