| 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 packaged_services_connection_->GetConnector()->StartService( | 282 packaged_services_connection_->GetConnector()->StartService( |
| 283 service_manager::Identity(mojom::kBrowserServiceName, | 283 service_manager::Identity(mojom::kBrowserServiceName, |
| 284 service_manager::mojom::kRootUserID), | 284 service_manager::mojom::kRootUserID), |
| 285 std::move(root_browser_service), mojo::MakeRequest(&pid_receiver)); | 285 std::move(root_browser_service), mojo::MakeRequest(&pid_receiver)); |
| 286 pid_receiver->SetPID(base::GetCurrentProcId()); | 286 pid_receiver->SetPID(base::GetCurrentProcId()); |
| 287 | 287 |
| 288 | 288 |
| 289 ServiceInfo device_info; | 289 ServiceInfo device_info; |
| 290 device_info.factory = | 290 device_info.factory = |
| 291 base::Bind(&device::CreateDeviceService, | 291 base::Bind(&device::CreateDeviceService, |
| 292 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)); | 292 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
| 293 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 293 device_info.task_runner = base::ThreadTaskRunnerHandle::Get(); | 294 device_info.task_runner = base::ThreadTaskRunnerHandle::Get(); |
| 294 packaged_services_connection_->AddEmbeddedService(device::mojom::kServiceName, | 295 packaged_services_connection_->AddEmbeddedService(device::mojom::kServiceName, |
| 295 device_info); | 296 device_info); |
| 296 | 297 |
| 297 ContentBrowserClient::StaticServiceMap services; | 298 ContentBrowserClient::StaticServiceMap services; |
| 298 GetContentClient()->browser()->RegisterInProcessServices(&services); | 299 GetContentClient()->browser()->RegisterInProcessServices(&services); |
| 299 for (const auto& entry : services) { | 300 for (const auto& entry : services) { |
| 300 packaged_services_connection_->AddEmbeddedService(entry.first, | 301 packaged_services_connection_->AddEmbeddedService(entry.first, |
| 301 entry.second); | 302 entry.second); |
| 302 } | 303 } |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 base::Bind(&DestroyConnectorOnIOThread)); | 352 base::Bind(&DestroyConnectorOnIOThread)); |
| 352 } | 353 } |
| 353 | 354 |
| 354 // static | 355 // static |
| 355 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { | 356 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { |
| 356 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 357 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 357 return g_io_thread_connector.Get().get(); | 358 return g_io_thread_connector.Get().get(); |
| 358 } | 359 } |
| 359 | 360 |
| 360 } // namespace content | 361 } // namespace content |
| OLD | NEW |