| 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 service_manager::mojom::kRootUserID), | 300 service_manager::mojom::kRootUserID), |
| 301 std::move(root_browser_service), mojo::MakeRequest(&pid_receiver)); | 301 std::move(root_browser_service), mojo::MakeRequest(&pid_receiver)); |
| 302 pid_receiver->SetPID(base::GetCurrentProcId()); | 302 pid_receiver->SetPID(base::GetCurrentProcId()); |
| 303 | 303 |
| 304 packaged_services_connection_->Start(); | 304 packaged_services_connection_->Start(); |
| 305 ServiceManagerConnection::GetForProcess()->Start(); | 305 ServiceManagerConnection::GetForProcess()->Start(); |
| 306 | 306 |
| 307 ServiceInfo device_info; | 307 ServiceInfo device_info; |
| 308 device_info.factory = | 308 device_info.factory = |
| 309 base::Bind(&device::CreateDeviceService, | 309 base::Bind(&device::CreateDeviceService, |
| 310 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)); | 310 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
| 311 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 311 packaged_services_connection_->AddEmbeddedService(device::mojom::kServiceName, | 312 packaged_services_connection_->AddEmbeddedService(device::mojom::kServiceName, |
| 312 device_info); | 313 device_info); |
| 313 | 314 |
| 314 ContentBrowserClient::StaticServiceMap services; | 315 ContentBrowserClient::StaticServiceMap services; |
| 315 GetContentClient()->browser()->RegisterInProcessServices(&services); | 316 GetContentClient()->browser()->RegisterInProcessServices(&services); |
| 316 for (const auto& entry : services) { | 317 for (const auto& entry : services) { |
| 317 packaged_services_connection_->AddEmbeddedService(entry.first, | 318 packaged_services_connection_->AddEmbeddedService(entry.first, |
| 318 entry.second); | 319 entry.second); |
| 319 } | 320 } |
| 320 | 321 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 base::Bind(&DestroyConnectorOnIOThread)); | 367 base::Bind(&DestroyConnectorOnIOThread)); |
| 367 } | 368 } |
| 368 | 369 |
| 369 // static | 370 // static |
| 370 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { | 371 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { |
| 371 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 372 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 372 return g_io_thread_connector.Get().get(); | 373 return g_io_thread_connector.Get().get(); |
| 373 } | 374 } |
| 374 | 375 |
| 375 } // namespace content | 376 } // namespace content |
| OLD | NEW |