| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" | 
| 6 | 6 | 
| 7 #include <stddef.h> | 7 #include <stddef.h> | 
| 8 | 8 | 
| 9 #include <memory> | 9 #include <memory> | 
| 10 #include <utility> | 10 #include <utility> | 
| (...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1066 } | 1066 } | 
| 1067 | 1067 | 
| 1068 void ProfileImpl::RegisterInProcessServices(StaticServiceMap* services) { | 1068 void ProfileImpl::RegisterInProcessServices(StaticServiceMap* services) { | 
| 1069   if (features::PrefServiceEnabled()) { | 1069   if (features::PrefServiceEnabled()) { | 
| 1070     content::ServiceInfo info; | 1070     content::ServiceInfo info; | 
| 1071     info.factory = base::Bind( | 1071     info.factory = base::Bind( | 
| 1072         &prefs::CreatePrefService, std::set<PrefValueStore::PrefStoreType>(), | 1072         &prefs::CreatePrefService, std::set<PrefValueStore::PrefStoreType>(), | 
| 1073         make_scoped_refptr(content::BrowserThread::GetBlockingPool())); | 1073         make_scoped_refptr(content::BrowserThread::GetBlockingPool())); | 
| 1074     info.task_runner = content::BrowserThread::GetTaskRunnerForThread( | 1074     info.task_runner = content::BrowserThread::GetTaskRunnerForThread( | 
| 1075         content::BrowserThread::IO); | 1075         content::BrowserThread::IO); | 
| 1076     services->insert(std::make_pair(prefs::mojom::kPrefStoreServiceName, info)); | 1076     services->insert(std::make_pair(prefs::mojom::kServiceName, info)); | 
| 1077   } | 1077   } | 
| 1078 | 1078 | 
| 1079   content::ServiceInfo identity_service_info; | 1079   content::ServiceInfo identity_service_info; | 
| 1080 | 1080 | 
| 1081   // The Identity Service must run on the UI thread. | 1081   // The Identity Service must run on the UI thread. | 
| 1082   identity_service_info.task_runner = base::ThreadTaskRunnerHandle::Get(); | 1082   identity_service_info.task_runner = base::ThreadTaskRunnerHandle::Get(); | 
| 1083 | 1083 | 
| 1084   // NOTE: The dependencies of the Identity Service have not yet been created, | 1084   // NOTE: The dependencies of the Identity Service have not yet been created, | 
| 1085   // so it is not possible to bind them here. Instead, bind them at the time | 1085   // so it is not possible to bind them here. Instead, bind them at the time | 
| 1086   // of the actual request to create the Identity Service. | 1086   // of the actual request to create the Identity Service. | 
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1344     return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1344     return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 
| 1345 | 1345 | 
| 1346   return service->CreateMonitor( | 1346   return service->CreateMonitor( | 
| 1347       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 1347       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 
| 1348 } | 1348 } | 
| 1349 | 1349 | 
| 1350 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() { | 1350 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() { | 
| 1351   SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this); | 1351   SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this); | 
| 1352   return base::MakeUnique<identity::IdentityService>(signin_manager); | 1352   return base::MakeUnique<identity::IdentityService>(signin_manager); | 
| 1353 } | 1353 } | 
| OLD | NEW | 
|---|